Merge branch 'master' into if-fixSpawn

Author: ifielker

npm-shrinkwrap.json

@@ -129,6 +129,7 @@
     "google-auth-library": "^9.11.0",
     "inquirer": "^8.2.6",
     "inquirer-autocomplete-prompt": "^2.0.1",
+    "js-yaml": "^3.14.1",
     "jsonwebtoken": "^9.0.0",
     "leven": "^3.1.0",
     "libsodium-wrappers": "^0.7.10",

package.json

@@ -369,7 +369,7 @@
                         "rootDirectory": {
                             "type": "string"
                         },
-                        "startCommandOverride": {
+                        "startCommand": {
                             "type": "string"
                         }
                     },

schema/firebase-config.json

@@ -184,7 +184,7 @@ export function toDatasource(
   locationId: string,
   ds: DatasourceYaml,
 ): Datasource {
-  if (ds.postgresql) {
+  if (ds?.postgresql) {
     return {
       postgresql: {
         database: ds.postgresql.database,

src/dataconnect/types.ts

@@ -38,7 +38,7 @@ export async function detectStartCommand(rootDir: string) {
     return `${packageManager} run dev`;
   } catch (e) {
     throw new FirebaseError(
-      "Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommandOverride`",
+      "Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommand`",
     );
   }
 }

src/emulator/apphosting/developmentServer.ts

@@ -5,7 +5,7 @@ interface AppHostingEmulatorArgs {
   options?: any;
   port?: number;
   host?: string;
-  startCommandOverride?: string;
+  startCommand?: string;
   rootDirectory?: string;
 }
 
@@ -19,7 +19,7 @@ export class AppHostingEmulator implements EmulatorInstance {
   async start(): Promise<void> {
     const { hostname, port } = await apphostingStart({
       port: this.args.port,
-      startCommand: this.args.startCommandOverride,
+      startCommand: this.args.startCommand,
       rootDirectory: this.args.rootDirectory,
     });
     this.args.options.host = hostname;

src/emulator/apphosting/index.ts

@@ -955,7 +955,7 @@ export async function startAll(
     const apphostingEmulator = new AppHostingEmulator({
       host: apphostingAddr.host,
       port: apphostingAddr.port,
-      startCommandOverride: apphostingConfig?.startCommandOverride,
+      startCommand: apphostingConfig?.startCommand,
       rootDirectory: apphostingConfig?.rootDirectory,
       options,
     });

src/emulator/controller.ts

@@ -30,11 +30,11 @@ export const AdditionalInitFns: AdditionalInitFnsType = {
     const backendRoot = join(cwd, backendRelativeDir);
     try {
       const startCommand = await detectStartCommand(backendRoot);
-      additionalConfigs.set("startCommandOverride", startCommand);
+      additionalConfigs.set("startCommand", startCommand);
     } catch (e) {
       logger.log(
         "WARN",
-        "Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommandOverride`",
+        "Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommand`",
       );
     }
 

src/emulator/initEmulators.ts

@@ -206,7 +206,7 @@ export type EmulatorsConfig = {
   apphosting?: {
     host?: string;
     port?: number;
-    startCommandOverride?: string;
+    startCommand?: string;
     rootDirectory?: string;
   };
   pubsub?: {