fixes & enhancements

Author: crowlKats

astro-demo/astro.config.mjs

@@ -5,5 +5,8 @@ import deno from "@deno/astro-adapter";
 // https://astro.build/config
 export default defineConfig({
   output: "server",
+  server: {
+    allowedHosts: ["deploy-subcommand-testing--local.deno.deno.net"],
+  },
   adapter: deno(),
 });

config.ts

@@ -4,7 +4,10 @@ import {
   modify as modifyJSONC,
   parse as parseJSONC,
 } from "jsonc-parser";
-import { resolve_config_with_deploy_config } from "./lib/rs_lib.js";
+import {
+  resolve_config,
+  resolve_config_with_deploy_config,
+} from "./lib/rs_lib.js";
 
 export interface Config {
   path: string;
@@ -20,6 +23,10 @@ export async function readConfig(
     return { path: maybeConfigPath, content };
   }
 
+  // we prefer the configs with the deploy key. then we fallback to a general
+  // config, so when we set the values, it uses existing config files instead
+  // of trying to create a new one (which will still happen if no config file is found)
+
   const configUrl = resolve_config_with_deploy_config(rootPath);
 
   if (configUrl) {
@@ -28,6 +35,14 @@ export async function readConfig(
     return { path, content };
   }
 
+  const configUrlWithoutDeployConfig = resolve_config(rootPath);
+
+  if (configUrlWithoutDeployConfig) {
+    const path = fromFileUrl(configUrlWithoutDeployConfig);
+    const content = await Deno.readTextFile(path);
+    return { path, content };
+  }
+
   return null;
 }
 

deno.json

@@ -1,4 +1,8 @@
 {
+  "nodeModulesDir": "auto",
+  "workspace": [
+    "astro-demo"
+  ],
   "name": "@deno/deploy",
   "license": "MIT",
   "tasks": {
@@ -31,5 +35,7 @@
     "@deno/framework-detect": "jsr:@deno/framework-detect@^0",
     "temporal-polyfill": "npm:temporal-polyfill@^0.3.0"
   },
-  "exclude": ["astro-demo"]
+  "exclude": [
+    "astro-demo"
+  ]
 }