firebase-tools 13.31.2 → 13.33.0

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

@@ -8,15 +8,20 @@ const backend_1 = require("../apphosting/backend");
 const apphosting_1 = require("../gcp/apphosting");
 const firedata_1 = require("../gcp/firedata");
 const requireTosAcceptance_1 = require("../requireTosAcceptance");
+const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:backends:create")
     .description("create a Firebase App Hosting backend")
     .option("-a, --app <webAppId>", "specify an existing Firebase web app's ID to associate your App Hosting backend with")
-    .option("-l, --location <location>", "specify the location of the backend", "")
+    .option("-l, --location <location>", "specify the location of the backend")
     .option("-s, --service-account <serviceAccount>", "specify the service account used to run the server", "")
     .before(apphosting_1.ensureApiEnabled)
     .before(requireInteractive_1.default)
     .before((0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.APPHOSTING_TOS_ID))
     .action(async (options) => {
+    if (options.location !== undefined) {
+        (0, utils_1.logWarning)("--location is being removed in the next major release. " +
+            "The CLI will prompt for a Primary Region where appropriate.");
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const webAppId = options.app;
     const location = options.location;

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

@@ -12,12 +12,16 @@ const backend_1 = require("../apphosting/backend");
 const ora = require("ora");
 exports.command = new command_1.Command("apphosting:backends:delete <backend>")
     .description("delete a Firebase App Hosting backend")
-    .option("-l, --location <location>", "specify the location of the backend", "-")
+    .option("-l, --location <location>", "specify the location of the backend")
     .withForce()
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    let location = options.location;
+    if (options.location !== undefined) {
+        utils.logWarning("--location is being removed in the next major release.");
+    }
+    let location = (_a = options.location) !== null && _a !== void 0 ? _a : "-";
     let backend;
     if (location === "-" || location === "") {
         backend = await (0, backend_1.getBackendForAmbiguousLocation)(projectId, backendId, "Please select the location of the backend you'd like to delete:");

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

@@ -9,11 +9,15 @@ const apphosting = require("../gcp/apphosting");
 const apphosting_backends_list_1 = require("./apphosting-backends-list");
 exports.command = new command_1.Command("apphosting:backends:get <backend>")
     .description("print info about a Firebase App Hosting backend")
-    .option("-l, --location <location>", "backend location", "-")
+    .option("-l, --location <location>", "backend location")
     .before(apphosting.ensureApiEnabled)
     .action(async (backend, options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
+    if (options.location !== undefined) {
+        (0, utils_1.logWarning)("--location is being removed in the next major release.");
+    }
+    const location = (_a = options.location) !== null && _a !== void 0 ? _a : "-";
     let backendsList = [];
     try {
         if (location !== "-") {

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

@@ -8,15 +8,19 @@ const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const apphosting = require("../gcp/apphosting");
 const Table = require("cli-table3");
+const utils_2 = require("../utils");
 const TABLE_HEAD = ["Backend", "Repository", "URL", "Location", "Updated Date"];
 exports.command = new command_1.Command("apphosting:backends:list")
     .description("list Firebase App Hosting backends")
-    .option("-l, --location <location>", "list backends in the specified location", "-")
+    .option("-l, --location <location>", "list backends in the specified location")
     .before(apphosting.ensureApiEnabled)
     .action(async (options) => {
-    var _a;
+    var _a, _b;
+    if (options.location !== undefined) {
+        (0, utils_2.logWarning)("--location is being removed in the next major release.");
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
+    const location = (_a = options.location) !== null && _a !== void 0 ? _a : "-";
     let backendRes;
     try {
         backendRes = await apphosting.listBackends(projectId, location);
@@ -24,7 +28,7 @@ exports.command = new command_1.Command("apphosting:backends:list")
     catch (err) {
         throw new error_1.FirebaseError(`Unable to list backends present for project: ${projectId}. Please check the parameters you have provided.`, { original: err });
     }
-    const backends = (_a = backendRes.backends) !== null && _a !== void 0 ? _a : [];
+    const backends = (_b = backendRes.backends) !== null && _b !== void 0 ? _b : [];
     printBackendsTable(backends);
     return backends;
 });

package/lib/commands/apphosting-builds-create.js

@@ -5,19 +5,23 @@ const apphosting = require("../gcp/apphosting");
 const logger_1 = require("../logger");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:builds:create <backendId>")
     .description("create a build for an App Hosting backend")
-    .option("-l, --location <location>", "specify the region of the backend", "us-central1")
+    .option("-l, --location <location>", "specify the region of the backend")
     .option("-i, --id <buildId>", "id of the build (defaults to autogenerating a random id)", "")
     .option("-b, --branch <branch>", "repository branch to deploy (defaults to 'main')", "main")
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
-    var _a;
+    var _a, _b;
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
+    if (options.location !== undefined) {
+        (0, utils_1.logWarning)("--location is being removed in the next major release.");
+    }
+    const location = (_a = options.location) !== null && _a !== void 0 ? _a : "us-central1";
     const buildId = options.buildId ||
         (await apphosting.getNextRolloutId(projectId, location, backendId));
-    const branch = (_a = options.branch) !== null && _a !== void 0 ? _a : "main";
+    const branch = (_b = options.branch) !== null && _b !== void 0 ? _b : "main";
     const op = await apphosting.createBuild(projectId, location, backendId, buildId, {
         source: {
             codebase: {

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

@@ -5,11 +5,17 @@ const apphosting = require("../gcp/apphosting");
 const logger_1 = require("../logger");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:builds:get <backendId> <buildId>")
     .description("get a build for an App Hosting backend")
-    .option("-l, --location <location>", "specify the region of the backend", "us-central1")
+    .option("-l, --location <location>", "specify the region of the backend")
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, buildId, options) => {
+    var _a;
+    if (options.location !== undefined) {
+        (0, utils_1.logWarning)("--location is being removed in the next major release.");
+    }
+    options.location = (_a = options.location) !== null && _a !== void 0 ? _a : "us-central";
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
     const build = await apphosting.getBuild(projectId, location, backendId, buildId);

package/lib/commands/apphosting-rollouts-create.js

@@ -6,16 +6,21 @@ const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
 const error_1 = require("../error");
 const rollout_1 = require("../apphosting/rollout");
+const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:rollouts:create <backendId>")
     .description("create a rollout using a build for an App Hosting backend")
-    .option("-l, --location <location>", "specify the region of the backend", "-")
+    .option("-l, --location <location>", "specify the region of the backend")
     .option("-b, --git-branch <gitBranch>", "repository branch to deploy (mutually exclusive with -g)")
     .option("-g, --git-commit <gitCommit>", "git commit to deploy (mutually exclusive with -b)")
     .withForce("Skip confirmation before creating rollout")
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
+    if (options.location !== undefined) {
+        (0, utils_1.logWarning)("--location is being removed in the next major release.");
+    }
+    const location = (_a = options.location) !== null && _a !== void 0 ? _a : "-";
     const branch = options.gitBranch;
     const commit = options.gitCommit;
     if (branch && commit) {

package/lib/commands/apphosting-rollouts-list.js

@@ -5,13 +5,18 @@ const apphosting = require("../gcp/apphosting");
 const logger_1 = require("../logger");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
+const utils_1 = require("../utils");
 exports.command = new command_1.Command("apphosting:rollouts:list <backendId>")
     .description("list rollouts of an App Hosting backend")
-    .option("-l, --location <location>", "region of the rollouts (defaults to listing rollouts from all regions)", "-")
+    .option("-l, --location <location>", "region of the rollouts (defaults to listing rollouts from all regions)")
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
+    var _a;
+    if (options.location !== undefined) {
+        (0, utils_1.logWarning)("--location is being removed in the next major release.");
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const location = options.location;
+    const location = (_a = options.location) !== null && _a !== void 0 ? _a : "-";
     const rollouts = await apphosting.listRollouts(projectId, location, backendId);
     if (rollouts.unreachable) {
         logger_1.logger.error(`WARNING: the following locations were unreachable: ${rollouts.unreachable.join(", ")}`);

package/lib/commands/apps-init.js

@@ -71,7 +71,7 @@ exports.command = new command_1.Command("apps:init [platform] [appId]")
         catch (e) {
             if (e.message.includes("associated with this Firebase project")) {
                 const projectId = (0, projectUtils_1.needProjectId)(options);
-                await (0, apps_1.sdkInit)(platform, Object.assign(Object.assign({}, options), { project: projectId }));
+                await (0, apps_1.sdkInit)(detectedPlatform, Object.assign(Object.assign({}, options), { project: projectId }));
             }
             else {
                 throw e;

package/lib/commands/emulators-start.js

@@ -105,11 +105,12 @@ function printEmulatorOverview(options) {
         const extensionsEmulatorInstance = registry_1.EmulatorRegistry.get(types_1.Emulators.EXTENSIONS);
         extensionsTable = extensionsEmulatorInstance.extensionsInfoTable();
     }
+    const hubInfo = registry_1.EmulatorRegistry.getInfo(types_1.Emulators.HUB);
     logger_1.logger.info(`\n${successMessageTable}
 
 ${emulatorsTable}
-${registry_1.EmulatorRegistry.isRunning(types_1.Emulators.HUB)
-        ? clc.blackBright("  Emulator Hub running at ") + registry_1.EmulatorRegistry.url(types_1.Emulators.HUB).host
+${hubInfo
+        ? clc.blackBright(`  Emulator Hub host: ${hubInfo.host} port: ${hubInfo.port}`)
         : clc.blackBright("  Emulator Hub not running.")}
 ${clc.blackBright("  Other reserved ports:")} ${reservedPortsString}
 ${extensionsTable}

package/lib/dataconnect/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.deleteSchema = exports.upsertSchema = exports.getSchema = exports.deleteServiceAndChildResources = exports.createService = exports.listAllServices = exports.getService = exports.listLocations = void 0;
+exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.deleteSchema = exports.upsertSchema = exports.getSchema = exports.deleteService = exports.createService = exports.listAllServices = exports.getService = exports.listLocations = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const operationPoller = require("../operation-poller");
@@ -46,7 +46,9 @@ async function createService(projectId, locationId, serviceId) {
 }
 exports.createService = createService;
 async function deleteService(serviceName) {
-    const op = await dataconnectClient().delete(serviceName);
+    const op = await dataconnectClient().delete(serviceName, {
+        queryParams: { force: "true" },
+    });
     const pollRes = await operationPoller.pollOperation({
         apiOrigin: (0, api_1.dataconnectOrigin)(),
         apiVersion: DATACONNECT_API_VERSION,
@@ -54,20 +56,7 @@ async function deleteService(serviceName) {
     });
     return pollRes;
 }
-async function deleteServiceAndChildResources(serviceName) {
-    const connectors = await listConnectors(serviceName);
-    await Promise.all(connectors.map(async (c) => deleteConnector(c.name)));
-    try {
-        await deleteSchema(serviceName);
-    }
-    catch (err) {
-        if (err.status !== 404) {
-            throw err;
-        }
-    }
-    await deleteService(serviceName);
-}
-exports.deleteServiceAndChildResources = deleteServiceAndChildResources;
+exports.deleteService = deleteService;
 async function getSchema(serviceName) {
     try {
         const res = await dataconnectClient().get(`${serviceName}/schemas/${types.SCHEMA_ID}`);

package/lib/dataconnect/schemaMigration.js

@@ -314,7 +314,7 @@ async function promptForInvalidConnectorError(options, serviceName, invalidConne
         return true;
     }
     if (!options.nonInteractive &&
-        (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: `Would you like to delete and recreate these connectors? This will cause ${clc.red(`downtime.`)}.` })))) {
+        (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: `Would you like to delete and recreate these connectors? This will cause ${clc.red(`downtime`)}.` })))) {
         return true;
     }
     const cmd = suggestedCommand(serviceName, invalidConnectors);

package/lib/deploy/dataconnect/deploy.js

@@ -9,6 +9,7 @@ const names_1 = require("../../dataconnect/names");
 const api_1 = require("../../api");
 const ensureApiEnabled = require("../../ensureApiEnabled");
 const node_path_1 = require("node:path");
+const prompt_1 = require("../../prompt");
 async function default_1(context, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const serviceInfos = context.dataconnect.serviceInfos;
@@ -33,10 +34,18 @@ async function default_1(context, options) {
         utils.logLabeledSuccess("dataconnect", `Created service ${s.serviceName}`);
     }));
     if (servicesToDelete.length) {
-        const warning = `The following services exist on ${projectId} but are not listed in your 'firebase.json'\n${servicesToDelete
-            .map((s) => s.name)
-            .join("\n")}\nConsider deleting these via the Firebase console if they are no longer needed.`;
-        utils.logLabeledWarning("dataconnect", warning);
+        if (await (0, prompt_1.confirm)({
+            force: options.force,
+            nonInteractive: options.nonInteractive,
+            message: `The following services exist on ${projectId} but are not listed in your 'firebase.json'\n${servicesToDelete
+                .map((s) => s.name)
+                .join("\n")}\nWould you like to delete these services?`,
+        })) {
+            await Promise.all(servicesToDelete.map(async (s) => {
+                await client.deleteService(s.name);
+                utils.logLabeledSuccess("dataconnect", `Deleted service ${s.name}`);
+            }));
+        }
     }
     utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
     await Promise.all(serviceInfos

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

@@ -16,6 +16,7 @@ function calculateChangesets(want, have, keyFn, deleteAll) {
         .filter((id) => deleteAll || (0, deploymentTool_1.isFirebaseManaged)(have[id].labels || {}))
         .map((id) => have[id]), keyFn);
     const toSkipPredicate = (id) => !!(!want[id].targetedByOnly &&
+        have[id].state === "ACTIVE" &&
         have[id].hash &&
         want[id].hash &&
         want[id].hash === have[id].hash);

package/lib/deploy/functions/runtimes/discovery/index.js

@@ -50,20 +50,25 @@ async function detectFromYaml(directory, project, runtime) {
     return yamlToBuild(parsed, project, api.functionsDefaultRegion(), runtime);
 }
 exports.detectFromYaml = detectFromYaml;
-async function detectFromPort(port, project, runtime, timeout = 10000) {
+async function detectFromPort(port, project, runtime, initialDelay = 0, timeout = 10000) {
     let res;
     const timedOut = new Promise((resolve, reject) => {
         setTimeout(() => {
             reject(new error_1.FirebaseError("User code failed to load. Cannot determine backend specification"));
         }, getFunctionDiscoveryTimeout() || timeout);
     });
+    if (initialDelay > 0) {
+        await new Promise((resolve) => setTimeout(resolve, initialDelay));
+    }
+    const url = `http://127.0.0.1:${port}/__/functions.yaml`;
     while (true) {
         try {
-            res = await Promise.race([(0, node_fetch_1.default)(`http://127.0.0.1:${port}/__/functions.yaml`), timedOut]);
+            res = await Promise.race([(0, node_fetch_1.default)(url), timedOut]);
             break;
         }
         catch (err) {
-            if ((err === null || err === void 0 ? void 0 : err.code) === "ECONNREFUSED") {
+            if ((err === null || err === void 0 ? void 0 : err.name) === "FetchError" ||
+                ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"].includes(err === null || err === void 0 ? void 0 : err.code)) {
                 continue;
             }
             throw err;

package/lib/deploy/functions/runtimes/python/index.js

@@ -149,7 +149,7 @@ class Delegate {
             });
             const killProcess = await this.serveAdmin(adminPort, envs);
             try {
-                discovered = await discovery.detectFromPort(adminPort, this.projectId, this.runtime);
+                discovered = await discovery.detectFromPort(adminPort, this.projectId, this.runtime, 500);
             }
             finally {
                 await killProcess();

package/lib/deploy/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploy = void 0;
+exports.deploy = exports.prepareFrameworksIfNeeded = exports.matchesHostingTarget = void 0;
 const clc = require("colorette");
 const logger_1 = require("../logger");
 const api_1 = require("../api");
@@ -40,8 +40,27 @@ const chain = async function (fns, context, options, payload) {
         await latest(context, options, payload);
     }
 };
+const matchesHostingTarget = (only, target) => {
+    if (!only)
+        return true;
+    if (!only.includes("hosting:"))
+        return true;
+    const targetStr = `hosting:${target !== null && target !== void 0 ? target : ""}`;
+    return only.split(",").some((t) => t === targetStr);
+};
+exports.matchesHostingTarget = matchesHostingTarget;
+const prepareFrameworksIfNeeded = async function (targetNames, options, context) {
+    const config = options.config.get("hosting");
+    if (Array.isArray(config)
+        ? config.some((it) => it.source && (0, exports.matchesHostingTarget)(options.only, it.target))
+        : config.source) {
+        experiments.assertEnabled("webframeworks", "deploy a web framework from source");
+        await (0, frameworks_1.prepareFrameworks)("deploy", targetNames, context, options);
+    }
+};
+exports.prepareFrameworksIfNeeded = prepareFrameworksIfNeeded;
 const deploy = async function (targetNames, options, customContext = {}) {
-    var _a;
+    var _a, _b, _c;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const payload = {};
     const context = Object.assign({ projectId }, customContext);
@@ -52,11 +71,7 @@ const deploy = async function (targetNames, options, customContext = {}) {
     const postdeploys = [];
     const startTime = Date.now();
     if (targetNames.includes("hosting")) {
-        const config = options.config.get("hosting");
-        if (Array.isArray(config) ? config.some((it) => it.source) : config.source) {
-            experiments.assertEnabled("webframeworks", "deploy a web framework from source");
-            await (0, frameworks_1.prepareFrameworks)("deploy", targetNames, context, options);
-        }
+        await (0, exports.prepareFrameworksIfNeeded)(targetNames, options, context);
     }
     if (targetNames.includes("hosting") && (0, prepare_1.hasPinnedFunctions)(options)) {
         experiments.assertEnabled("pintags", "deploy a tagged function as a hosting rewrite");
@@ -120,11 +135,11 @@ const deploy = async function (targetNames, options, customContext = {}) {
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
     logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)((_a = options.project) !== null && _a !== void 0 ? _a : "_", "/overview"));
     if (deployedHosting) {
-        (0, lodash_1.each)(context.hosting.deploys, (deploy) => {
+        (0, lodash_1.each)((_b = context.hosting) === null || _b === void 0 ? void 0 : _b.deploys, (deploy) => {
             logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)((0, api_1.hostingOrigin)(), deploy.config.site));
         });
-        const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
-        return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };
+        const versionNames = (_c = context.hosting) === null || _c === void 0 ? void 0 : _c.deploys.map((deploy) => deploy.version);
+        return { hosting: (versionNames === null || versionNames === void 0 ? void 0 : versionNames.length) === 1 ? versionNames[0] : versionNames };
     }
     else {
         return { hosting: undefined };

package/lib/deploy/lifecycleHooks.js

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

package/lib/emulator/constants.js

@@ -103,6 +103,7 @@ Constants.FIREBASE_ENABLED_EXPERIMENTS = "FIREBASE_ENABLED_EXPERIMENTS";
 Constants.FIRESTORE_EMULATOR_HOST = "FIRESTORE_EMULATOR_HOST";
 Constants.FIRESTORE_EMULATOR_ENV_ALT = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
 Constants.FIREBASE_DATABASE_EMULATOR_HOST = "FIREBASE_DATABASE_EMULATOR_HOST";
+Constants.FIREBASE_DATACONNECT_EMULATOR_HOST = "FIREBASE_DATACONNECT_EMULATOR_HOST";
 Constants.FIREBASE_AUTH_EMULATOR_HOST = "FIREBASE_AUTH_EMULATOR_HOST";
 Constants.FIREBASE_STORAGE_EMULATOR_HOST = "FIREBASE_STORAGE_EMULATOR_HOST";
 Constants.CLOUD_STORAGE_EMULATOR_HOST = "STORAGE_EMULATOR_HOST";

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.8.2",
-            expectedSize: 25506560,
-            expectedChecksum: "2db676cb9d30b289897ffb7e5aa1ef63",
+            version: "1.8.4",
+            expectedSize: 25588480,
+            expectedChecksum: "421f6226a0433b824642c03eb0b6862d",
         }
         : process.platform === "win32"
             ? {
-                version: "1.8.2",
-                expectedSize: 25936384,
-                expectedChecksum: "08e6ca0ad20893b565fb57effd687eb8",
+                version: "1.8.4",
+                expectedSize: 26020352,
+                expectedChecksum: "b78c95a7f071f127acda3a76cdcc8c48",
             }
             : {
-                version: "1.8.2",
-                expectedSize: 25415832,
-                expectedChecksum: "24e0eb78acb619ed91f6d268dd18df05",
+                version: "1.8.4",
+                expectedSize: 25501848,
+                expectedChecksum: "0aabd622b1a99b2a0d9c9dec4c7404fc",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/env.js

@@ -34,6 +34,8 @@ function setEnvVarsForEmulators(env, emulators) {
             case types_1.Emulators.TASKS:
                 env[constants_1.Constants.CLOUD_TASKS_EMULATOR_HOST] = host;
                 break;
+            case types_1.Emulators.DATACONNECT:
+                env[constants_1.Constants.FIREBASE_DATACONNECT_EMULATOR_HOST] = host;
         }
     }
 }

package/lib/emulator/hub.js

@@ -20,7 +20,7 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         }
         const data = fs.readFileSync(locatorPath, "utf8").toString();
         const locator = JSON.parse(data);
-        if (!vsCodeUtils_1.isVSCodeExtension && locator.version !== this.CLI_VERSION) {
+        if (!(0, vsCodeUtils_1.isVSCodeExtension)() && locator.version !== this.CLI_VERSION) {
             logger_1.logger.debug(`Found locator with mismatched version, ignoring: ${JSON.stringify(locator)}`);
             return undefined;
         }

package/lib/frameworks/vite/index.js

@@ -12,7 +12,7 @@ const utils_1 = require("../utils");
 exports.name = "Vite";
 exports.support = "experimental";
 exports.type = 4;
-exports.supportedRange = "3 - 5";
+exports.supportedRange = "3 - 6";
 exports.DEFAULT_BUILD_SCRIPT = ["vite build", "tsc && vite build"];
 const initViteTemplate = (template) => async (setup, config) => await init(setup, config, template);
 exports.initViteTemplate = initViteTemplate;

package/lib/gcp/cloudfunctions.js

@@ -265,6 +265,21 @@ function endpointFromFunction(gcfFunction) {
     if ((_h = gcfFunction.labels) === null || _h === void 0 ? void 0 : _h[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];
     }
+    proto.convertIfPresent(endpoint, gcfFunction, "state", "status", (status) => {
+        if (status === "ACTIVE") {
+            return "ACTIVE";
+        }
+        else if (status === "OFFLINE") {
+            return "FAILED";
+        }
+        else if (status === "DEPLOY_IN_PROGRESS") {
+            return "DEPLOYING";
+        }
+        else if (status === "DELETE_IN_PROGRESS") {
+            return "DELETING";
+        }
+        return "UNKONWN";
+    });
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;

package/lib/gcp/cloudfunctionsv2.js

@@ -91,7 +91,7 @@ async function createFunction(cloudFunction) {
     const components = cloudFunction.name.split("/");
     const functionId = components.splice(-1, 1)[0];
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."), LOG_EXECUTION_ID: "true" });
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -147,7 +147,7 @@ async function updateFunction(cloudFunction) {
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
     fieldMasks.push("buildConfig.buildEnvironmentVariables");
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."), LOG_EXECUTION_ID: "true" });
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),
@@ -389,6 +389,7 @@ function endpointFromFunction(gcfFunction) {
     if ((_f = gcfFunction.labels) === null || _f === void 0 ? void 0 : _f[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];
     }
+    proto.copyIfPresent(endpoint, gcfFunction, "state");
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;

package/lib/hosting/implicitInit.js

@@ -9,7 +9,6 @@ const logger_1 = require("../logger");
 const registry_1 = require("../emulator/registry");
 const types_1 = require("../emulator/types");
 const templates_1 = require("../templates");
-const INIT_TEMPLATE = (0, templates_1.readTemplateSync)("hosting/init.js");
 async function implicitInit(options) {
     let config;
     try {
@@ -47,8 +46,13 @@ async function implicitInit(options) {
         }
     }
     const emulatorsJson = JSON.stringify(emulators, null, 2);
-    const js = INIT_TEMPLATE.replace("/*--CONFIG--*/", `var firebaseConfig = ${configJson};`).replace("/*--EMULATORS--*/", "var firebaseEmulators = undefined;");
-    const emulatorsJs = INIT_TEMPLATE.replace("/*--CONFIG--*/", `var firebaseConfig = ${configJson};`).replace("/*--EMULATORS--*/", `var firebaseEmulators = ${emulatorsJson};`);
+    const initTemplate = (0, templates_1.readTemplateSync)("hosting/init.js");
+    const js = initTemplate
+        .replace("/*--CONFIG--*/", `var firebaseConfig = ${configJson};`)
+        .replace("/*--EMULATORS--*/", "var firebaseEmulators = undefined;");
+    const emulatorsJs = initTemplate
+        .replace("/*--CONFIG--*/", `var firebaseConfig = ${configJson};`)
+        .replace("/*--EMULATORS--*/", `var firebaseEmulators = ${emulatorsJson};`);
     return {
         js,
         emulatorsJs,

package/lib/init/features/dataconnect/index.js

@@ -23,6 +23,7 @@ const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconn
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
 const MUTATIONS_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/mutations.gql");
+const serviceEnvVar = () => (0, utils_1.envOverride)("FDC_SERVICE", "");
 const emptyConnector = {
     id: "default",
     path: "./connector",
@@ -192,19 +193,31 @@ async function promptForExistingServices(setup, info, isBillingEnabled) {
         };
     }));
     if (existingServicesAndSchemas.length) {
-        const choices = existingServicesAndSchemas.map((s) => {
+        let choice;
+        const [serviceLocationFromEnvVar, serviceIdFromEnvVar] = serviceEnvVar().split("/");
+        const serviceFromEnvVar = existingServicesAndSchemas.find((s) => {
             const serviceName = (0, names_1.parseServiceName)(s.service.name);
-            return {
-                name: `${serviceName.location}/${serviceName.serviceId}`,
-                value: s,
-            };
-        });
-        choices.push({ name: "Create a new service", value: undefined });
-        const choice = await (0, prompt_1.promptOnce)({
-            message: "Your project already has existing services. Which would you like to set up local files for?",
-            type: "list",
-            choices,
+            return (serviceName.serviceId === serviceIdFromEnvVar &&
+                serviceName.location === serviceLocationFromEnvVar);
         });
+        if (serviceFromEnvVar) {
+            choice = serviceFromEnvVar;
+        }
+        else {
+            const choices = existingServicesAndSchemas.map((s) => {
+                const serviceName = (0, names_1.parseServiceName)(s.service.name);
+                return {
+                    name: `${serviceName.location}/${serviceName.serviceId}`,
+                    value: s,
+                };
+            });
+            choices.push({ name: "Create a new service", value: undefined });
+            choice = await (0, prompt_1.promptOnce)({
+                message: "Your project already has existing services. Which would you like to set up local files for?",
+                type: "list",
+                choices,
+            });
+        }
         if (choice) {
             const serviceName = (0, names_1.parseServiceName)(choice.service.name);
             info.serviceId = serviceName.serviceId;

package/lib/management/apps.js

@@ -566,13 +566,16 @@ async function findIntelligentPathForAndroid(appDir, options) {
         const dirs = [];
         for (const fileOrDir of currentFiles) {
             if (fileOrDir.isDirectory()) {
+                if (fileOrDir.name !== "gradle") {
+                    dirs.push(fileOrDir.name);
+                }
                 if (fileOrDir.name === "src") {
                     return appDir;
                 }
             }
         }
         let module = path.join(appDir, "app");
-        if (dirs.length === 1) {
+        if (dirs.length === 1 && dirs[0] === "app") {
             return module;
         }
         if (!options.nonInteractive) {

package/lib/vsCodeUtils.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVSCodeExtension = void 0;
-const process_1 = require("process");
+exports.setIsVSCodeExtension = exports.isVSCodeExtension = void 0;
+let _IS_WEBPACKED_FOR_VSCE = false;
 function isVSCodeExtension() {
-    return !!process_1.env.VSCODE_CWD;
+    return _IS_WEBPACKED_FOR_VSCE;
 }
 exports.isVSCodeExtension = isVSCodeExtension;
+function setIsVSCodeExtension(v) {
+    _IS_WEBPACKED_FOR_VSCE = v;
+}
+exports.setIsVSCodeExtension = setIsVSCodeExtension;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.31.2",
+  "version": "13.33.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {