add 'run' back into 'npm run build' and read build args from env

Author: blidd-google

packages/@apphosting/adapter-angular/src/bin/build.ts

@@ -10,28 +10,38 @@ import {
 
 const root = process.cwd();
 
-// Determine which build runner to use
-let cmd = process.env.MONOREPO_COMMAND || DEFAULT_COMMAND;
+// TODO(blidd-google): Refactor monorepo logic into separate module
 
-// Read environment variable (only relevant for monorepos with multiple targets)
-let target = process.env.MONOREPO_PROJECT || "";
+// Determine which project in a monorepo to build. The environment variable will only exist when
+// a monorepo has been detected in the parent buildpacks, so it can also be used to determine
+// whether the project we are building is in a monorepo setup.
+const project = process.env.MONOREPO_PROJECT || "";
 
 // Determine root of project to build.
 let projectRoot = root;
 // N.B. We don't want to change directories for monorepo builds, so that the build process can
 // locate necessary files outside the project directory (e.g. at the root).
-if (process.env.FIREBASE_APP_DIRECTORY && !target) {
+if (process.env.FIREBASE_APP_DIRECTORY && !project) {
   projectRoot = projectRoot.concat("/", process.env.FIREBASE_APP_DIRECTORY);
 }
 
+// Determine which command to run the build
+const cmd = process.env.MONOREPO_COMMAND || DEFAULT_COMMAND;
+
+// Parse args to pass to the build command
+let cmdArgs: string[] = [];
+if (process.env.MONOREPO_BUILD_ARGS) {
+  cmdArgs = process.env.MONOREPO_BUILD_ARGS.split(",");
+}
+
 // Check build conditions, which vary depending on your project structure (standalone or monorepo)
-if (target) {
-  checkMonorepoBuildConditions(cmd, target);
+if (project) {
+  checkMonorepoBuildConditions(cmd, project);
 } else {
   await checkStandaloneBuildConditions(projectRoot);
 }
 
-const outputBundleOptions = await build(projectRoot, cmd, target);
+const outputBundleOptions = await build(projectRoot, cmd, ...cmdArgs);
 await generateOutputDirectory(root, outputBundleOptions);
 
 await validateOutputDirectory(outputBundleOptions);

packages/@apphosting/adapter-angular/src/utils.ts

@@ -111,7 +111,7 @@ export const build = (
   new Promise((resolve, reject) => {
     // enable JSON build logs for application builder
     process.env.NG_BUILD_LOGS_JSON = "1";
-    const childProcess = spawn(cmd, ["build", ...argv], {
+    const childProcess = spawn(cmd, ["run", "build", ...argv], {
       cwd: projectRoot,
       shell: true,
       stdio: ["inherit", "pipe", "pipe"],