Web frameworks - Fix Astro config loading (#6213)

* change config loading depending on version

* compare correct version

* update changelog

* remove fs

* extract configPath

Author: Austin Crim

CHANGELOG.md

@@ -1 +1,2 @@
+- Fixed Astro web framework bug when loading configuration for version `2.9.7` and above. (#6213)
 - Increase Next.js config bundle timeout to 60 seconds (#6214)

src/frameworks/astro/index.ts

@@ -3,23 +3,13 @@ import { copy, existsSync } from "fs-extra";
 import { join } from "path";
 import { BuildResult, Discovery, FrameworkType, SupportLevel } from "../interfaces";
 import { FirebaseError } from "../../error";
-import {
-  readJSON,
-  simpleProxy,
-  warnIfCustomBuildScript,
-  findDependency,
-  getNodeModuleBin,
-} from "../utils";
-import { getBootstrapScript, getConfig } from "./utils";
+import { readJSON, simpleProxy, warnIfCustomBuildScript, getNodeModuleBin } from "../utils";
+import { getAstroVersion, getBootstrapScript, getConfig } from "./utils";
 
 export const name = "Astro";
 export const support = SupportLevel.Experimental;
 export const type = FrameworkType.MetaFramework;
 
-function getAstroVersion(cwd: string): string | undefined {
-  return findDependency("astro", { cwd, depth: 0, omitDev: false })?.version;
-}
-
 export async function discover(dir: string): Promise<Discovery | undefined> {
   if (!existsSync(join(dir, "package.json"))) return;
   if (!getAstroVersion(dir)) return;

src/frameworks/astro/utils.ts

@@ -1,4 +1,6 @@
 import { dirname, join, relative } from "path";
+import { findDependency } from "../utils";
+import { gte } from "semver";
 
 const { dynamicImport } = require(true && "../../dynamicImport");
 
@@ -10,15 +12,30 @@ export function getBootstrapScript() {
 
 export async function getConfig(cwd: string) {
   const astroDirectory = dirname(require.resolve("astro/package.json", { paths: [cwd] }));
-  const { openConfig }: typeof import("astro/dist/core/config/config") = await dynamicImport(
-    join(astroDirectory, "dist", "core", "config", "config.js")
-  );
-  const logging: any = undefined; // TODO figure out the types here
-  const { astroConfig: config } = await openConfig({ cmd: "build", cwd, logging });
+  const version = getAstroVersion(cwd);
+
+  let config;
+  const configPath = join(astroDirectory, "dist", "core", "config", "config.js");
+  if (gte(version!, "2.9.7")) {
+    const { resolveConfig } = await dynamicImport(configPath);
+    const { astroConfig } = await resolveConfig({ root: cwd }, "build");
+    config = astroConfig;
+  } else {
+    const { openConfig }: typeof import("astro/dist/core/config/config") = await dynamicImport(
+      configPath
+    );
+    const logging: any = undefined; // TODO figure out the types here
+    const { astroConfig } = await openConfig({ cmd: "build", cwd, logging });
+    config = astroConfig;
+  }
   return {
     outDir: relative(cwd, config.outDir.pathname),
     publicDir: relative(cwd, config.publicDir.pathname),
     output: config.output,
     adapter: config.adapter,
   };
 }
+
+export function getAstroVersion(cwd: string): string | undefined {
+  return findDependency("astro", { cwd, depth: 0, omitDev: false })?.version;
+}