Clean up

Author: annajowang

package-lock.json

@@ -3,15 +3,14 @@ import promiseSpawn from "@npmcli/promise-spawn";
 import { dirname, join, relative } from "path";
 import { fileURLToPath } from "url";
 import { parse as parseYaml } from "yaml";
-import { spawn } from "child_process";
 import fsExtra from "fs-extra";
 import { scenarios } from "./scenarios.ts";
 
 const { readFileSync, mkdirp, rmdir } = fsExtra;
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-const errors: any[] = [];
+const errors: Error[] = [];
 
 await rmdir(join(__dirname, "runs"), { recursive: true }).catch(() => undefined);
 
@@ -58,7 +57,7 @@ for (const [scenarioName, scenario] of scenarios) {
       ).version;
 
   try {
-    await promiseSpawn("node", [buildScript, ...scenario.inputs], {
+    const result = await promiseSpawn("node", [buildScript, ...scenario.inputs], {
       cwd,
       stdioString: true,
       stdio: "pipe",
@@ -67,10 +66,9 @@ for (const [scenarioName, scenario] of scenarios) {
         ...process.env,
         FRAMEWORK_VERSION: frameworkVersion,
       },
-    }).then((result) => {
-      // Write stdout and stderr to the log file
-      fsExtra.writeFileSync(buildLogPath, result.stdout + result.stderr);
     });
+    // Write stdout and stderr to the log file
+    fsExtra.writeFileSync(buildLogPath, result.stdout + result.stderr);
 
     try {
       // Determine which test files to run
@@ -96,9 +94,8 @@ for (const [scenarioName, scenario] of scenarios) {
     console.error(`Error in scenario ${scenarioName}:`, e);
     errors.push(e);
   }
-
-  if (errors.length) {
-    console.error(errors);
-    process.exit(1);
-  }
+}
+if (errors.length) {
+  console.error(errors);
+  process.exit(1);
 }

packages/@apphosting/build/e2e/run-local-build.ts

@@ -2,7 +2,6 @@ import pkg from "@apphosting/common";
 const { OutputBundleConfig } = pkg;
 
 interface Scenario {
-  name: string; // Name of the scenario
   inputs: string[];
   expectedBundleYaml: OutputBundleConfig;
   tests?: string[]; // List of test files to run

packages/@apphosting/build/e2e/scenarios.ts

@@ -8,8 +8,8 @@
         "url": "git+https://github.com/FirebaseExtended/firebase-framework-tools.git"
     },
     "bin": {
-      "build": "dist/bin/build.js",
-      "apphosting-local-build": "dist/bin/localbuild.js"
+        "build": "dist/bin/build.js",
+        "apphosting-local-build": "dist/bin/localbuild.js"
     },
     "author": {
         "name": "Firebase",
@@ -21,9 +21,9 @@
     "type": "module",
     "sideEffects": false,
     "scripts": {
-      "build": "rm -rf dist && tsc && chmod +x ./dist/bin/*",
-      "test": "npm run test:functional",
-      "test:functional": "node --loader ts-node/esm ./e2e/run-local-build.ts"
+        "build": "rm -rf dist && tsc && chmod +x ./dist/bin/*",
+        "test": "npm run test:functional",
+        "test:functional": "node --loader ts-node/esm ./e2e/run-local-build.ts"
     },
     "exports": {
         ".": {
@@ -40,9 +40,11 @@
         "colorette": "^2.0.20",
         "commander": "^11.1.0",
         "npm-pick-manifest": "^9.0.0",
-        "ts-node": "^10.9.1"
+        "ts-node": "^10.9.1",
+        "tsc": "^2.0.4"
     },
     "devDependencies": {
-      "@types/commander": "*"
+        "@types/commander": "*",
+        "typescript": "^5.9.2"
     }
 }

packages/@apphosting/build/package.json

@@ -1,4 +1,4 @@
-import { spawn } from "child_process";
+import promiseSpawn from "@npmcli/promise-spawn";
 import { yellow, bgRed, bold } from "colorette";
 
 export async function adapterBuild(projectRoot: string, framework: string) {
@@ -10,7 +10,12 @@ export async function adapterBuild(projectRoot: string, framework: string) {
     throw new Error(
       `Failed to fetch ${adapterName}: ${packumentResponse.status} ${packumentResponse.statusText}`,
     );
-  const packument = await packumentResponse.json();
+  let packument;
+  try {
+    packument = await packumentResponse.json();
+  } catch (e) {
+    throw new Error(`Failed to parse response from NPM registry for ${adapterName}.`);
+  };
   const adapterVersion = packument?.["dist-tags"]?.["latest"];
   if (!adapterVersion) {
     throw new Error(`Could not find 'latest' dist-tag for ${adapterName}`);
@@ -20,20 +25,9 @@ export async function adapterBuild(projectRoot: string, framework: string) {
   console.log(" 🔥", bgRed(` ${adapterName}@${yellow(bold(adapterVersion))} `), "\n");
 
   const buildCommand = `apphosting-adapter-${framework}-build`;
-  await new Promise<void>((resolve, reject) => {
-    const child = spawn("npx", ["-y", "-p", `${adapterName}@${adapterVersion}`, buildCommand], {
-      cwd: projectRoot,
-      shell: true,
-      stdio: "inherit",
-    });
-
-    child.on("error", reject);
-
-    child.on("exit", (code) => {
-      if (code !== 0) {
-        reject(new Error(`framework adapter build failed with error code ${code}.`));
-      }
-      resolve();
-    });
+  await promiseSpawn("npx", ["-y", "-p", `${adapterName}@${adapterVersion}`, buildCommand], {
+    cwd: projectRoot,
+    shell: true,
+    stdio: "inherit",
   });
 }

packages/@apphosting/build/src/adapter-builds.ts

@@ -1,13 +1,8 @@
 #! /usr/bin/env node
-import { SupportedFrameworks, ApphostingConfig } from "@apphosting/common";
+import { SupportedFrameworks } from "@apphosting/common";
 import { adapterBuild } from "../adapter-builds.js";
-import { parse as parseYaml } from "yaml";
-import fsExtra from "fs-extra";
-import { join } from "path";
 import { program } from "commander";
 
-export const { readFileSync } = fsExtra;
-
 program
   .argument("<projectRoot>", "path to the project's root directory")
   .option("--framework <framework>")
@@ -17,7 +12,7 @@ program
     // TODO(#382): parse apphosting.yaml for environment variables / secrets needed during build time.
     if (opts.framework && SupportedFrameworks.includes(opts.framework)) {
       // TODO(#382): Skip this if there's a custom build command in apphosting.yaml.
-      adapterBuild(projectRoot, opts.framework);
+      await adapterBuild(projectRoot, opts.framework);
     }
 
     // TODO(#382): Parse apphosting.yaml to set custom run command in bundle.yaml

packages/@apphosting/build/src/bin/localbuild.ts

@@ -8,7 +8,7 @@
   },
   "include": [
     "src/index.ts",
-    "src/bin/*.ts"
+    "src/bin/*.ts",
   ],
   "exclude": [
     "src/*.spec.ts"

packages/@apphosting/build/tsconfig.json

@@ -3,7 +3,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 
 // List of apphosting supported frameworks.
-export const SupportedFrameworks = ["nextjs", "angular"];
+export const SupportedFrameworks = ["nextjs", "angular"] as const;
 
 // **** OutputBundleConfig interfaces ****