Separate adapter builds into helper function.

Author: annajowang

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

@@ -0,0 +1,35 @@
+import { spawn } from "child_process";
+import { program } from "commander";
+import { yellow, bgRed, bold } from "colorette";
+
+export async function adapterBuild(framework: string, projectRoot: string) {
+  // TODO(#382): We are using the latest framework adapter versions, but in the future
+  // we should parse the framework version and use the matching adapter version.
+  const adapterName = `@apphosting/adapter-${framework}`;
+  const packumentResponse = await fetch(`https://registry.npmjs.org/${adapterName}`);
+  if (!packumentResponse.ok) throw new Error(`Something went wrong fetching ${adapterName}`);
+  const packument = await packumentResponse.json();
+  const adapterVersion = packument?.["dist-tags"]?.["latest"];
+  if (!adapterVersion) {
+    throw new Error(`Could not find 'latest' dist-tag for ${adapterName}`);
+  }
+  // TODO(#382): should check for existence of adapter in app's package.json and use that version instead.
+
+  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("exit", (code) => {
+      if (code !== 0) {
+        reject(new Error(`framework adapter build failed with error code ${code}.`));
+      }
+      resolve();
+    });
+  });
+}

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

@@ -2,45 +2,23 @@
 import { spawn } from "child_process";
 import { program } from "commander";
 import { yellow, bgRed, bold } from "colorette";
+import { SupportedFrameworks } from "@apphosting/common";
+import { adapterBuild } from "../adapter-builds.js";
 
-// TODO(#382): add framework option later or incorporate micro-discovery.
-// TODO(#382): parse apphosting.yaml for environment variables / secrets.
-// TODO(#382): parse apphosting.yaml for runConfig and include in buildSchema
+// TODO(#382): parse apphosting.yaml for environment variables / secrets needed during build time.
 // TODO(#382): Support custom build and run commands (parse and pass run command to build schema).
-program
-  .argument("<projectRoot>", "path to the project's root directory")
-  .action(async (projectRoot: string) => {
-    const framework = "nextjs";
-    // TODO(#382): We are using the latest framework adapter versions, but in the future
-    // we should parse the framework version and use the matching adapter version.
-    const adapterName = `@apphosting/adapter-nextjs`;
-    const packumentResponse = await fetch(`https://registry.npmjs.org/${adapterName}`);
-    if (!packumentResponse.ok) throw new Error(`Something went wrong fetching ${adapterName}`);
-    const packument = await packumentResponse.json();
-    const adapterVersion = packument?.["dist-tags"]?.["latest"];
-    if (!adapterVersion) {
-      throw new Error(`Could not find 'latest' dist-tag for ${adapterName}`);
-    }
-    // TODO(#382): should check for existence of adapter in app's package.json and use that version instead.
 
-    console.log(" 🔥", bgRed(` ${adapterName}@${yellow(bold(adapterVersion))} `), "\n");
+// TODO(#382): parse apphosting.yaml for environment variables / secrets needed during runtime to include in the bunde.yaml
+// TODO(#382): parse apphosting.yaml for runConfig to include in bundle.yaml
 
-    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",
-      });
+program
+  .argument("<projectRoot>", "path to the project's root directory")
+  .argument("<framework>", "the framework to build for")
+  .action(async (projectRoot: string, framework: string) => {
 
-      child.on("exit", (code) => {
-        if (code !== 0) {
-          reject(new Error(`framework adapter build failed with error code ${code}.`));
-        }
-        resolve();
-      });
-    });
-    //  TODO(#382): parse bundle.yaml and apphosting.yaml and output a buildschema somewhere.
+    if (SupportedFrameworks.includes(framework)) {
+      adapterBuild(framework, projectRoot)
+    }
   });
 
 program.parse();

packages/@apphosting/common/src/index.ts

@@ -2,6 +2,9 @@ import { spawn } from "child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 
+// List of apphosting supported frameworks.
+export const SupportedFrameworks = ['nextjs', 'angular'];
+
 // Output bundle metadata specifications to be written to bundle.yaml
 export interface OutputBundleConfig {
   version: "v1";