firebase-tools 13.25.0 → 13.27.0

package/lib/commands/apphosting-backends-get.js

@@ -27,7 +27,7 @@ exports.command = new command_1.Command("apphosting:backends:get <backend>")
         }
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Failed to get backend: ${backend}. Please check the parameters you have provided.`, { original: err });
+        throw new error_1.FirebaseError(`Failed to get backend: ${backend}. Please check the parameters you have provided.`, { original: (0, error_1.getError)(err) });
     }
     if (backendsList.length === 0) {
         (0, utils_1.logWarning)(`Backend "${backend}" not found`);

package/lib/commands/apphosting-config-export.js

@@ -2,17 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
-const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const requireAuth_1 = require("../requireAuth");
 const secretManager = require("../gcp/secretManager");
 const requirePermissions_1 = require("../requirePermissions");
 const config_1 = require("../apphosting/config");
-const secrets_1 = require("../apphosting/secrets");
-const path_1 = require("path");
-const fs = require("../fsutils");
-const yaml_1 = require("../apphosting/yaml");
 const error_1 = require("../error");
+const detectProjectRoot_1 = require("../detectProjectRoot");
 exports.command = new command_1.Command("apphosting:config:export")
     .description("Export App Hosting configurations such as secrets into an apphosting.local.yaml file")
     .option("-s, --secrets <apphosting.yaml or apphosting.<environment>.yaml file to export secrets from>", "This command combines the base apphosting.yaml with the specified environment-specific file (e.g., apphosting.staging.yaml). If keys conflict, the environment-specific file takes precedence.")
@@ -20,32 +16,14 @@ exports.command = new command_1.Command("apphosting:config:export")
     .before(secretManager.ensureApi)
     .before(requirePermissions_1.requirePermissions, ["secretmanager.versions.access"])
     .action(async (options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const environmentConfigFile = options.secrets;
     const cwd = process.cwd();
-    let localAppHostingConfig = yaml_1.AppHostingYamlConfig.empty();
     const backendRoot = (0, config_1.discoverBackendRoot)(cwd);
     if (!backendRoot) {
         throw new error_1.FirebaseError("Missing apphosting.yaml: This command requires an apphosting.yaml configuration file. Please run 'firebase init apphosting' and try again.");
     }
-    const localAppHostingConfigPath = (0, path_1.resolve)(backendRoot, config_1.APPHOSTING_LOCAL_YAML_FILE);
-    if (fs.fileExistsSync(localAppHostingConfigPath)) {
-        localAppHostingConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(localAppHostingConfigPath);
-    }
-    const configToExport = await (0, secrets_1.loadConfigToExport)(cwd, environmentConfigFile);
-    const secretsToExport = configToExport.secrets;
-    if (!secretsToExport) {
-        logger_1.logger.warn("No secrets found to export in the chosen App Hosting config files");
-        return;
-    }
-    const secretMaterial = await (0, secrets_1.fetchSecrets)(projectId, secretsToExport);
-    for (const [key, value] of secretMaterial) {
-        localAppHostingConfig.addEnvironmentVariable({
-            variable: key,
-            value: value,
-            availability: ["RUNTIME"],
-        });
-    }
-    localAppHostingConfig.upsertFile(localAppHostingConfigPath);
-    logger_1.logger.info(`Wrote secrets as environment variables to ${config_1.APPHOSTING_LOCAL_YAML_FILE}.`);
+    const projectRoot = (_a = (0, detectProjectRoot_1.detectProjectRoot)({})) !== null && _a !== void 0 ? _a : backendRoot;
+    await (0, config_1.exportConfig)(cwd, projectRoot, backendRoot, projectId, environmentConfigFile);
 });

package/lib/commands/database-import.js

@@ -71,8 +71,10 @@ exports.command = new command_1.Command("database:import <path> [infile]")
         if (err instanceof error_1.FirebaseError) {
             throw err;
         }
-        logger_1.logger.debug(err);
-        throw new error_1.FirebaseError(`Unexpected error while importing data: ${err}`, { exit: 2 });
+        logger_1.logger.debug((0, error_1.getErrMsg)(err));
+        throw new error_1.FirebaseError(`Unexpected error while importing data: ${(0, error_1.getErrMsg)(err)}`, {
+            exit: 2,
+        });
     }
     if (responses.length) {
         utils.logSuccess("Data persisted successfully");

package/lib/commands/database-push.js

@@ -49,8 +49,10 @@ exports.command = new command_1.Command("database:push <path> [infile]")
         });
     }
     catch (err) {
-        logger_1.logger.debug(err);
-        throw new error_1.FirebaseError(`Unexpected error while pushing data: ${err}`, { exit: 2 });
+        logger_1.logger.debug((0, error_1.getErrMsg)(err));
+        throw new error_1.FirebaseError(`Unexpected error while pushing data: ${(0, error_1.getErrMsg)(err)}`, {
+            exit: 2,
+        });
     }
     if (!path.endsWith("/")) {
         path += "/";

package/lib/commands/database-set.js

@@ -59,8 +59,10 @@ exports.command = new command_1.Command("database:set <path> [infile]")
         });
     }
     catch (err) {
-        logger_1.logger.debug(err);
-        throw new error_1.FirebaseError(`Unexpected error while setting data: ${err}`, { exit: 2 });
+        logger_1.logger.debug((0, error_1.getErrMsg)(err));
+        throw new error_1.FirebaseError(`Unexpected error while setting data: ${(0, error_1.getErrMsg)(err)}`, {
+            exit: 2,
+        });
     }
     utils.logSuccess("Data persisted successfully");
     logger_1.logger.info();

package/lib/commands/database-settings-get.js

@@ -34,7 +34,7 @@ exports.command = new command_1.Command("database:settings:get <path>")
     catch (err) {
         throw new error_1.FirebaseError(`Unexpected error fetching configs at ${path}`, {
             exit: 2,
-            original: err,
+            original: (0, error_1.getError)(err),
         });
     }
     if (typeof res.body === "object") {

package/lib/commands/database-settings-set.js

@@ -38,7 +38,7 @@ exports.command = new command_1.Command("database:settings:set <path> <value>")
     catch (err) {
         throw new error_1.FirebaseError(`Unexpected error fetching configs at ${path}`, {
             exit: 2,
-            original: err,
+            original: (0, error_1.getError)(err),
         });
     }
     utils.logSuccess("Successfully set setting.");

package/lib/commands/ext-dev-init.js

@@ -66,8 +66,8 @@ exports.command = new command_1.Command("ext:dev:init")
     }
     catch (err) {
         if (!(err instanceof error_1.FirebaseError)) {
-            throw new error_1.FirebaseError(`Error occurred when initializing files for new extension: ${err.message}`, {
-                original: err,
+            throw new error_1.FirebaseError(`Error occurred when initializing files for new extension: ${(0, error_1.getErrMsg)(err)}`, {
+                original: (0, error_1.getError)(err),
             });
         }
         throw err;

package/lib/commands/ext-dev-list.js

@@ -19,7 +19,7 @@ exports.command = new command_1.Command("ext:dev:list <publisherId>")
         extensions = await (0, publisherApi_1.listExtensions)(publisherId);
     }
     catch (err) {
-        throw new error_1.FirebaseError(err);
+        throw new error_1.FirebaseError((0, error_1.getErrMsg)(err));
     }
     if (extensions.length < 1) {
         throw new error_1.FirebaseError(`There are no extensions uploaded under publisher ID ${clc.bold(publisherId)}. This could happen for two reasons:\n` +

package/lib/commands/ext-dev-register.js

@@ -35,7 +35,7 @@ exports.command = new command_1.Command("ext:dev:register")
         profile = await (0, publisherApi_1.registerPublisherProfile)(projectId, publisherId);
     }
     catch (err) {
-        if (err.status === 409) {
+        if ((0, error_1.getErrStatus)(err) === 409) {
             const error = `Couldn't register the publisher ID '${clc.bold(publisherId)}' to the project '${clc.bold(projectId)}'.` +
                 " This can happen for either of two reasons:\n\n" +
                 ` - Publisher ID '${clc.bold(publisherId)}' is registered to another project\n` +
@@ -43,7 +43,7 @@ exports.command = new command_1.Command("ext:dev:register")
                 ` Try again with a unique publisher ID or a new project. If your business’s name has been registered to another project, contact Firebase support ${(0, marked_1.marked)("(https://firebase.google.com/support/troubleshooter/contact).")}`;
             throw new error_1.FirebaseError(error, { exit: 1 });
         }
-        throw new error_1.FirebaseError(`Failed to register publisher ID ${clc.bold(publisherId)} for project ${clc.bold(projectId)}: ${err.message}`);
+        throw new error_1.FirebaseError(`Failed to register publisher ID ${clc.bold(publisherId)} for project ${clc.bold(projectId)}: ${(0, error_1.getErrMsg)(err)}`);
     }
     utils.logLabeledSuccess(extensionsHelper_1.logPrefix, `Publisher ID '${clc.bold(publisherId)}' has been registered to project ${clc.bold(projectId)}. View and edit your profile at ${utils.consoleUrl(projectId, `/publisher`)}`);
     return profile;

package/lib/commands/ext-dev-upload.js

@@ -44,13 +44,13 @@ async function uploadExtensionAction(extensionRef, options) {
         profile = await (0, publisherApi_1.getPublisherProfile)("-", publisherId);
     }
     catch (err) {
-        if (err.status === 404) {
+        if ((0, error_1.getErrStatus)(err) === 404) {
             throw (0, extensionsHelper_1.getMissingPublisherError)(publisherId);
         }
         throw err;
     }
     const projectNumber = `${(0, extensionsHelper_2.getPublisherProjectFromName)(profile.name)}`;
-    const { projectId } = await (0, projects_1.getFirebaseProject)(projectNumber);
+    const { projectId } = await (0, projects_1.getProject)(projectNumber);
     await (0, tos_1.acceptLatestPublisherTOS)(options, projectNumber);
     let res;
     if (options.local) {

package/lib/commands/ext-dev-usage.js

@@ -36,7 +36,7 @@ exports.command = new command_1.Command("ext:dev:usage <publisherId>")
             extensions = await (0, publisherApi_1.listExtensions)(publisherId);
         }
         catch (err) {
-            throw new error_1.FirebaseError(err);
+            throw new error_1.FirebaseError((0, error_1.getErrMsg)(err));
         }
         if (extensions.length < 1) {
             throw new error_1.FirebaseError(`There are no published extensions associated with publisher ID ${clc.bold(publisherId)}. This could happen for two reasons:\n` +
@@ -77,7 +77,7 @@ exports.command = new command_1.Command("ext:dev:usage <publisherId>")
     }
     catch (err) {
         throw new error_1.FirebaseError(`Error occurred when fetching usage data for extension ${extensionName}`, {
-            original: err,
+            original: (0, error_1.getError)(err),
         });
     }
     if (!response) {

package/lib/commands/ext-install.js

@@ -110,8 +110,8 @@ exports.command = new command_1.Command("ext:install [extensionRef]")
     }
     catch (err) {
         if (!(err instanceof error_1.FirebaseError)) {
-            throw new error_1.FirebaseError(`Error occurred saving the extension to manifest: ${err.message}`, {
-                original: err,
+            throw new error_1.FirebaseError(`Error occurred saving the extension to manifest: ${(0, error_1.getErrMsg)(err)}`, {
+                original: (0, error_1.getError)(err),
             });
         }
         throw err;

package/lib/commands/index.js

@@ -17,11 +17,14 @@ function load(client) {
     client.appdistribution = {};
     client.appdistribution.distribute = loadCommand("appdistribution-distribute");
     client.appdistribution.testers = {};
+    client.appdistribution.testers.list = loadCommand("appdistribution-testers-list");
     client.appdistribution.testers.add = loadCommand("appdistribution-testers-add");
     client.appdistribution.testers.delete = loadCommand("appdistribution-testers-remove");
     client.appdistribution.group = {};
-    client.appdistribution.group.create = loadCommand("appdistribution-group-create");
-    client.appdistribution.group.delete = loadCommand("appdistribution-group-delete");
+    client.appdistribution.group.list = loadCommand("appdistribution-groups-list");
+    client.appdistribution.group.create = loadCommand("appdistribution-groups-create");
+    client.appdistribution.group.delete = loadCommand("appdistribution-groups-delete");
+    client.appdistribution.groups = client.appdistribution.group;
     client.apps = {};
     client.apps.create = loadCommand("apps-create");
     client.apps.list = loadCommand("apps-list");
@@ -169,6 +172,8 @@ function load(client) {
         client.apphosting.secrets.grantaccess = loadCommand("apphosting-secrets-grantaccess");
         client.apphosting.secrets.describe = loadCommand("apphosting-secrets-describe");
         client.apphosting.secrets.access = loadCommand("apphosting-secrets-access");
+        client.apphosting.config = {};
+        client.apphosting.config.export = loadCommand("apphosting-config-export");
         if (experiments.isEnabled("internaltesting")) {
             client.apphosting.builds = {};
             client.apphosting.builds.get = loadCommand("apphosting-builds-get");
@@ -179,10 +184,6 @@ function load(client) {
             client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
             client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
         }
-        if (experiments.isEnabled("emulatorapphosting")) {
-            client.apphosting.config = {};
-            client.apphosting.config.export = loadCommand("apphosting-config-export");
-        }
     }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");

package/lib/commands/use.js

@@ -53,7 +53,7 @@ exports.command = new command_1.Command("use [alias_or_project_id]")
         const hasAlias = options.rc.hasProjectAlias(newActive);
         const resolvedProject = options.rc.resolveAlias(newActive);
         (0, command_2.validateProjectId)(resolvedProject);
-        return (0, projects_1.getFirebaseProject)(resolvedProject)
+        return (0, projects_1.getProject)(resolvedProject)
             .then((foundProject) => {
             project = foundProject;
         })

package/lib/deploy/extensions/deploy.js

@@ -18,7 +18,9 @@ async function deploy(context, options, payload) {
         ...((_b = payload.instancesToUpdate) !== null && _b !== void 0 ? _b : []),
         ...((_c = payload.instancesToConfigure) !== null && _c !== void 0 ? _c : []),
     ]);
-    await (0, secrets_1.handleSecretParams)(payload, context.have, options.nonInteractive);
+    if (context.have) {
+        await (0, secrets_1.handleSecretParams)(payload, context.have, options.nonInteractive);
+    }
     const errorHandler = new errors_1.ErrorHandler();
     const validationQueue = new queue_1.default({
         retries: 5,

package/lib/deploy/extensions/deploymentSummary.js

@@ -11,7 +11,7 @@ const humanReadableUpdate = (from, to) => {
         to.ref &&
         from.ref.publisherId === to.ref.publisherId &&
         from.ref.extensionId === to.ref.extensionId) {
-        return `\t${clc.bold(from.instanceId)} (${refs.toExtensionVersionRef(from.ref)} => ${(_a = to.ref) === null || _a === void 0 ? void 0 : _a.version})`;
+        return `\t${clc.bold(from.instanceId)} (${refs.toExtensionVersionRef(from.ref)} => ${((_a = to.ref) === null || _a === void 0 ? void 0 : _a.version) || ""})`;
     }
     else {
         const fromRef = from.ref
@@ -32,6 +32,9 @@ function updatesSummary(toUpdate, have) {
     const instancesToUpdate = toUpdate
         .map((to) => {
         const from = have.find((exists) => exists.instanceId === to.instanceId);
+        if (!from) {
+            return "";
+        }
         return humanReadableUpdate(from, to);
     })
         .join("\n");

package/lib/deploy/extensions/planner.js

@@ -46,6 +46,9 @@ async function getExtensionSpec(i) {
             throw new error_1.FirebaseError("InstanceSpec had no ref or localPath, unable to get extensionSpec");
         }
     }
+    if (!i.extensionSpec) {
+        throw new error_1.FirebaseError("Internal error getting extension");
+    }
     return i.extensionSpec;
 }
 exports.getExtensionSpec = getExtensionSpec;
@@ -54,8 +57,12 @@ async function haveDynamic(projectId) {
         .filter((i) => { var _a; return ((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"; })
         .map((i) => {
         var _a;
+        const instanceId = i.name.split("/").pop();
+        if (!instanceId) {
+            throw new error_1.FirebaseError(`Internal error getting instanceId from ${i.name}`);
+        }
         const dep = {
-            instanceId: i.name.split("/").pop(),
+            instanceId,
             params: i.config.params,
             systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
             allowedEventTypes: i.config.allowedEventTypes,
@@ -77,8 +84,12 @@ async function have(projectId) {
         .filter((i) => { var _a; return !(((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"); })
         .map((i) => {
         var _a;
+        const instanceId = i.name.split("/").pop();
+        if (!instanceId) {
+            throw new error_1.FirebaseError(`Internal error getting instanceId from ${i.name}`);
+        }
         const dep = {
-            instanceId: i.name.split("/").pop(),
+            instanceId,
             params: i.config.params,
             systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
             allowedEventTypes: i.config.allowedEventTypes,
@@ -196,7 +207,7 @@ async function want(args) {
             }
         }
         catch (err) {
-            logger_1.logger.debug(`Got error reading extensions entry ${e}: ${err}`);
+            logger_1.logger.debug(`Got error reading extensions entry ${e[0]} (${e[1]}): ${(0, error_1.getErrMsg)(err)}`);
             errors.push(err);
         }
     }

package/lib/deploy/extensions/prepare.js

@@ -18,6 +18,15 @@ const v2FunctionHelper_1 = require("./v2FunctionHelper");
 const tos_1 = require("../../extensions/tos");
 const common_1 = require("../../extensions/runtimes/common");
 const functionsDeployHelper_1 = require("../functions/functionsDeployHelper");
+const matchesInstanceId = (dep) => (test) => {
+    return dep.instanceId === test.instanceId;
+};
+const isUpdate = (dep) => (test) => {
+    return dep.instanceId === test.instanceId && !refs.equal(dep.ref, test.ref);
+};
+const isConfigure = (dep) => (test) => {
+    return dep.instanceId === test.instanceId && refs.equal(dep.ref, test.ref);
+};
 async function prepareHelper(context, options, payload, wantExtensions, haveExtensions, isDynamic) {
     var _a, _b;
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -146,12 +155,3 @@ async function prepare(context, options, payload) {
     return prepareHelper(context, options, payload, wantExtensions, haveExtensions, false);
 }
 exports.prepare = prepare;
-const matchesInstanceId = (dep) => (test) => {
-    return dep.instanceId === test.instanceId;
-};
-const isUpdate = (dep) => (test) => {
-    return dep.instanceId === test.instanceId && !refs.equal(dep.ref, test.ref);
-};
-const isConfigure = (dep) => (test) => {
-    return dep.instanceId === test.instanceId && refs.equal(dep.ref, test.ref);
-};

package/lib/deploy/functions/ensure.js

@@ -15,7 +15,7 @@ const metadataCallCache = new Map();
 async function defaultServiceAccount(e) {
     let metadataCall = metadataCallCache.get(e.project);
     if (!metadataCall) {
-        metadataCall = (0, projects_1.getFirebaseProject)(e.project);
+        metadataCall = (0, projects_1.getProject)(e.project);
         metadataCallCache.set(e.project, metadataCall);
     }
     const metadata = await metadataCall;

package/lib/deploy/functions/release/fabricator.js

@@ -224,7 +224,7 @@ class Fabricator {
         }
     }
     async createV2Function(endpoint, scraper) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
             logger_1.logger.debug("Precondition failed. Cannot create a GCFv2 function without storage");
@@ -295,8 +295,8 @@ class Fabricator {
                 }
             });
         }
-        endpoint.uri = (_d = resultFunction.serviceConfig) === null || _d === void 0 ? void 0 : _d.uri;
-        const serviceName = (_e = resultFunction.serviceConfig) === null || _e === void 0 ? void 0 : _e.service;
+        endpoint.uri = resultFunction.url;
+        const serviceName = (_d = resultFunction.serviceConfig) === null || _d === void 0 ? void 0 : _d.service;
         endpoint.runServiceId = utils.last(serviceName === null || serviceName === void 0 ? void 0 : serviceName.split("/"));
         if (!serviceName) {
             logger_1.logger.debug("Result function unexpectedly didn't have a service name.");

package/lib/deploy/lifecycleHooks.js

@@ -8,9 +8,10 @@ const error_1 = require("../error");
 const needProjectId = require("../projectUtils").needProjectId;
 const logger_1 = require("../logger");
 const path = require("path");
+const vsCodeUtils_1 = require("../vsCodeUtils");
 function runCommand(command, childOptions) {
     const escapedCommand = command.replace(/\"/g, '\\"');
-    const isVSCode = utils.isVSCodeExtension();
+    const isVSCode = (0, vsCodeUtils_1.isVSCodeExtension)();
     const nodeExecutable = isVSCode ? "node" : process.execPath;
     const crossEnvShellPath = isVSCode
         ? path.resolve(__dirname, "./cross-env/dist/bin/cross-env-shell.js")

package/lib/emulator/apphosting/config.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalAppHostingConfiguration = void 0;
 const path_1 = require("path");
 const config_1 = require("../../apphosting/config");
-async function getLocalAppHostingConfiguration(cwd) {
-    const appHostingConfigPaths = (0, config_1.discoverConfigsAtBackendRoot)(cwd);
+const yaml_1 = require("../../apphosting/yaml");
+async function getLocalAppHostingConfiguration(backendDir) {
+    const appHostingConfigPaths = (0, config_1.listAppHostingFilesInPath)(backendDir);
     const fileNameToPathMap = new Map();
     for (const path of appHostingConfigPaths) {
         const fileName = (0, path_1.basename)(path);
@@ -12,6 +13,15 @@ async function getLocalAppHostingConfiguration(cwd) {
     }
     const baseFilePath = fileNameToPathMap.get(config_1.APPHOSTING_BASE_YAML_FILE);
     const localFilePath = fileNameToPathMap.get(config_1.APPHOSTING_LOCAL_YAML_FILE);
-    return await (0, config_1.loadConfigForEnvironment)(localFilePath !== null && localFilePath !== void 0 ? localFilePath : baseFilePath, baseFilePath);
+    if (!baseFilePath && !localFilePath) {
+        return yaml_1.AppHostingYamlConfig.empty();
+    }
+    if (!baseFilePath || !localFilePath) {
+        return await yaml_1.AppHostingYamlConfig.loadFromFile((baseFilePath || localFilePath));
+    }
+    const localYamlConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(localFilePath);
+    const baseConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(baseFilePath);
+    baseConfig.merge(localYamlConfig);
+    return baseConfig;
 }
 exports.getLocalAppHostingConfiguration = getLocalAppHostingConfiguration;

package/lib/emulator/apphosting/developmentServer.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectStartCommand = exports.detectPackageManager = exports.logger = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const emulatorLogger_1 = require("../emulatorLogger");
+const types_1 = require("../types");
+const error_1 = require("../../error");
+exports.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
+async function detectPackageManager(rootdir) {
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "pnpm-lock.yaml"))) {
+        return "pnpm";
+    }
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "yarn.lock"))) {
+        return "yarn";
+    }
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "package-lock.json"))) {
+        return "npm";
+    }
+    throw new error_1.FirebaseError("Unsupported package manager");
+}
+exports.detectPackageManager = detectPackageManager;
+async function detectStartCommand(rootDir) {
+    try {
+        const packageManager = await detectPackageManager(rootDir);
+        return `${packageManager} run dev`;
+    }
+    catch (e) {
+        throw new error_1.FirebaseError("Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommandOverride`");
+    }
+}
+exports.detectStartCommand = detectStartCommand;

package/lib/emulator/apphosting/index.js

@@ -3,24 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppHostingEmulator = void 0;
 const types_1 = require("../types");
 const serve_1 = require("./serve");
-const utils_1 = require("./utils");
+const developmentServer_1 = require("./developmentServer");
 class AppHostingEmulator {
     constructor(args) {
         this.args = args;
     }
     async start() {
         const { hostname, port } = await (0, serve_1.start)({
+            port: this.args.port,
             startCommand: this.args.startCommandOverride,
+            rootDirectory: this.args.rootDirectory,
         });
         this.args.options.host = hostname;
         this.args.options.port = port;
     }
     connect() {
-        utils_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "connecting apphosting emulator");
+        developmentServer_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "connecting apphosting emulator");
         return Promise.resolve();
     }
     stop() {
-        utils_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "stopping apphosting emulator");
+        developmentServer_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "stopping apphosting emulator");
         return Promise.resolve();
     }
     getInfo() {

package/lib/emulator/apphosting/serve.js

@@ -3,38 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
 const net_1 = require("net");
 const portUtils_1 = require("../portUtils");
-const utils_1 = require("./utils");
+const developmentServer_1 = require("./developmentServer");
 const constants_1 = require("../constants");
 const spawn_1 = require("../../init/spawn");
-const utils_2 = require("./utils");
+const developmentServer_2 = require("./developmentServer");
 const types_1 = require("../types");
 const config_1 = require("./config");
+const projectPath_1 = require("../../projectPath");
 async function start(options) {
+    var _a;
     const hostname = constants_1.DEFAULT_HOST;
-    let port = constants_1.DEFAULT_PORTS.apphosting;
+    let port = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PORTS.apphosting;
     while (!(await availablePort(hostname, port))) {
         port += 1;
     }
-    serve(port, options === null || options === void 0 ? void 0 : options.startCommand);
+    serve(port, options === null || options === void 0 ? void 0 : options.startCommand, options === null || options === void 0 ? void 0 : options.rootDirectory);
     return { hostname, port };
 }
 exports.start = start;
-async function serve(port, startCommand) {
-    const rootDir = process.cwd();
-    const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(rootDir);
+async function serve(port, startCommand, backendRelativeDir) {
+    backendRelativeDir = backendRelativeDir !== null && backendRelativeDir !== void 0 ? backendRelativeDir : "./";
+    const backendRoot = (0, projectPath_1.resolveProjectPath)({}, backendRelativeDir);
+    const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(backendRoot);
     const environmentVariablesAsRecord = {};
     for (const env of apphostingLocalConfig.environmentVariables) {
         environmentVariablesAsRecord[env.variable] = env.value;
     }
     const environmentVariablesToInject = Object.assign(Object.assign({}, environmentVariablesAsRecord), { PORT: port.toString() });
     if (startCommand) {
-        utils_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
-        await (0, spawn_1.spawnWithCommandString)(startCommand, rootDir, environmentVariablesToInject);
+        developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
+        await (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject);
         return;
     }
-    const packageManager = await (0, utils_1.discoverPackageManager)(rootDir);
-    utils_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${packageManager} run dev'`);
-    await (0, spawn_1.wrapSpawn)(packageManager, ["run", "dev"], rootDir, environmentVariablesToInject);
+    const detectedStartCommand = await (0, developmentServer_1.detectStartCommand)(backendRoot);
+    developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${detectedStartCommand}'`);
+    await (0, spawn_1.spawnWithCommandString)(detectedStartCommand, backendRoot, environmentVariablesToInject);
 }
 function availablePort(host, port) {
     return (0, portUtils_1.checkListenable)({

package/lib/emulator/commandUtils.js

@@ -300,8 +300,9 @@ async function emulatorExec(script, options) {
         exitCode = await runScript(script, extraEnv);
         await controller.onExit(options);
     }
-    catch (_a) {
+    catch (err) {
         await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_START_ERRORED });
+        throw err;
     }
     finally {
         await controller.cleanShutdown();