firebase-tools 14.12.1 → 14.14.0

package/lib/deploy/dataconnect/prepare.js

@@ -27,7 +27,6 @@ async function default_1(context, options) {
     await (0, ensureApis_1.ensureApis)(projectId);
     await (0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.DATA_CONNECT_TOS_ID)(options);
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(options.config);
-    utils.logLabeledBullet("dataconnect", `Preparing to deploy`);
     const filters = (0, filters_1.getResourceFilters)(options);
     const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, options.config, c.source)));
     for (const si of serviceInfos) {
@@ -50,7 +49,7 @@ async function default_1(context, options) {
         serviceInfos,
         filters,
     };
-    utils.logLabeledBullet("dataconnect", `Successfully prepared schema and connectors`);
+    utils.logLabeledBullet("dataconnect", `Successfully compiled schema and connectors`);
     if (options.dryRun) {
         for (const si of serviceInfos) {
             await (0, schemaMigration_1.diffSchema)(options, si.schema, (_c = (_b = (_a = si.dataConnectYaml.schema) === null || _a === void 0 ? void 0 : _a.datasource) === null || _b === void 0 ? void 0 : _b.postgresql) === null || _c === void 0 ? void 0 : _c.schemaValidation);
@@ -61,23 +60,21 @@ async function default_1(context, options) {
             return !filters || (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
         })
             .map(async (s) => {
-            var _a, _b;
+            var _a, _b, _c;
             const postgresDatasource = s.schema.datasources.find((d) => d.postgresql);
             if (postgresDatasource) {
-                const instanceId = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance.split("/").pop();
-                const databaseId = (_b = postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database;
+                const instanceId = (_b = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance.split("/").pop();
+                const databaseId = (_c = postgresDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database;
                 if (!instanceId || !databaseId) {
                     return Promise.resolve();
                 }
-                const enableGoogleMlIntegration = (0, types_1.requiresVector)(s.deploymentMetadata);
-                return (0, provisionCloudSql_1.provisionCloudSql)({
+                return (0, provisionCloudSql_1.setupCloudSql)({
                     projectId,
                     location: (0, names_1.parseServiceName)(s.serviceName).location,
                     instanceId,
                     databaseId,
-                    enableGoogleMlIntegration,
-                    waitForCreation: true,
-                    dryRun: options.dryRun,
+                    requireGoogleMlIntegration: (0, types_1.requiresVector)(s.deploymentMetadata),
+                    dryRun: true,
                 });
             }
         }));

package/lib/deploy/dataconnect/release.js

@@ -5,6 +5,8 @@ const client_1 = require("../../dataconnect/client");
 const prompts_1 = require("../../dataconnect/prompts");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 const projectUtils_1 = require("../../projectUtils");
+const names_1 = require("../../dataconnect/names");
+const logger_1 = require("../../logger");
 async function default_1(context, options) {
     const project = (0, projectUtils_1.needProjectId)(options);
     const serviceInfos = context.dataconnect.serviceInfos;
@@ -23,20 +25,7 @@ async function default_1(context, options) {
             validationMode: (_d = (_c = (_b = (_a = s.dataConnectYaml) === null || _a === void 0 ? void 0 : _a.schema) === null || _b === void 0 ? void 0 : _b.datasource) === null || _c === void 0 ? void 0 : _c.postgresql) === null || _d === void 0 ? void 0 : _d.schemaValidation,
         });
     });
-    if (wantSchemas.length) {
-        utils.logLabeledBullet("dataconnect", "Deploying Data Connect schemas...");
-        for (const s of wantSchemas) {
-            await (0, schemaMigration_1.migrateSchema)({
-                options,
-                schema: s.schema,
-                validateOnly: false,
-                schemaValidation: s.validationMode,
-            });
-        }
-        utils.logLabeledBullet("dataconnect", "Schemas deployed.");
-    }
-    let wantConnectors = [];
-    wantConnectors = wantConnectors.concat(...serviceInfos.map((si) => si.connectorInfo
+    const wantConnectors = serviceInfos.flatMap((si) => si.connectorInfo
         .filter((c) => {
         return (!filters ||
             filters.some((f) => {
@@ -44,30 +33,53 @@ async function default_1(context, options) {
                     (f.connectorId === c.connectorYaml.connectorId || f.fullService));
             }));
     })
-        .map((c) => c.connector)));
-    const haveConnectors = await have(serviceInfos);
-    const connectorsToDelete = filters
-        ? []
-        : haveConnectors.filter((h) => !wantConnectors.some((w) => w.name === h.name));
-    if (wantConnectors.length) {
-        utils.logLabeledBullet("dataconnect", "Deploying connectors...");
-        await Promise.all(wantConnectors.map(async (c) => {
+        .map((c) => c.connector));
+    const remainingConnectors = await Promise.all(wantConnectors.map(async (c) => {
+        try {
+            await (0, client_1.upsertConnector)(c);
+        }
+        catch (err) {
+            logger_1.logger.debug("Error pre-deploying connector", c.name, err);
+            return c;
+        }
+        utils.logLabeledSuccess("dataconnect", `Deployed connector ${c.name}`);
+        return undefined;
+    }));
+    for (const s of wantSchemas) {
+        await (0, schemaMigration_1.migrateSchema)({
+            options,
+            schema: s.schema,
+            validateOnly: false,
+            schemaValidation: s.validationMode,
+        });
+        utils.logLabeledSuccess("dataconnect", `Migrated schema ${s.schema.name}`);
+    }
+    await Promise.all(remainingConnectors.map(async (c) => {
+        if (c) {
             await (0, client_1.upsertConnector)(c);
             utils.logLabeledSuccess("dataconnect", `Deployed connector ${c.name}`);
-        }));
-        for (const c of connectorsToDelete) {
-            await (0, prompts_1.promptDeleteConnector)(options, c.name);
         }
-        utils.logLabeledBullet("dataconnect", "Connectors deployed.");
+    }));
+    const allConnectors = await deployedConnectors(serviceInfos);
+    const connectorsToDelete = filters
+        ? []
+        : allConnectors.filter((h) => !wantConnectors.some((w) => w.name === h.name));
+    for (const c of connectorsToDelete) {
+        await (0, prompts_1.promptDeleteConnector)(options, c.name);
     }
-    else {
-        utils.logLabeledBullet("dataconnect", "No connectors to deploy.");
+    let consolePath = "/dataconnect";
+    if (serviceInfos.length === 1) {
+        const sn = (0, names_1.parseServiceName)(serviceInfos[0].serviceName);
+        consolePath += `/locations/${sn.location}/services/${sn.serviceId}/schema`;
     }
-    utils.logLabeledSuccess("dataconnect", `Deployment complete! View your deployed schema and connectors at ${utils.consoleUrl(project, "/dataconnect")}`);
+    utils.logLabeledSuccess("dataconnect", `Deployment complete! View your deployed schema and connectors at
+
+    ${utils.consoleUrl(project, consolePath)}
+`);
     return;
 }
 exports.default = default_1;
-async function have(serviceInfos) {
+async function deployedConnectors(serviceInfos) {
     let connectors = [];
     for (const si of serviceInfos) {
         connectors = connectors.concat(await (0, client_1.listConnectors)(si.serviceName));

package/lib/deploy/functions/backend.js

@@ -94,7 +94,7 @@ function secretVersionName(s) {
     return `projects/${s.projectId}/secrets/${s.secret}/versions/${(_a = s.version) !== null && _a !== void 0 ? _a : "latest"}`;
 }
 exports.secretVersionName = secretVersionName;
-exports.AllFunctionsPlatforms = ["gcfv1", "gcfv2"];
+exports.AllFunctionsPlatforms = ["gcfv1", "gcfv2", "run"];
 function isHttpsTriggered(triggered) {
     return {}.hasOwnProperty.call(triggered, "httpsTrigger");
 }
@@ -184,6 +184,7 @@ async function loadExistingBackend(ctx) {
     ctx.unreachableRegions = {
         gcfV1: [],
         gcfV2: [],
+        run: [],
     };
     const gcfV1Results = await gcf.listAllFunctions(ctx.projectId);
     for (const apiFunction of gcfV1Results.functions) {
@@ -212,7 +213,7 @@ async function loadExistingBackend(ctx) {
     }
 }
 async function checkAvailability(context, want) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!context.loadedExistingBackend) {
         await loadExistingBackend(context);
     }
@@ -248,6 +249,11 @@ async function checkAvailability(context, want) {
             context.unreachableRegions.gcfV2.join("\n") +
             "\nCloud Functions in these regions won't be deleted.");
     }
+    if ((_e = context.unreachableRegions) === null || _e === void 0 ? void 0 : _e.run.length) {
+        utils.logLabeledWarning("functions", "The following Cloud Run regions are currently unreachable:\n" +
+            context.unreachableRegions.run.join("\n") +
+            "\nCloud Run services in these regions won't be deleted.");
+    }
 }
 exports.checkAvailability = checkAvailability;
 function allEndpoints(backend) {

package/lib/deploy/functions/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBackend = exports.envWithTypes = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
+exports.applyPrefix = exports.toBackend = exports.envWithTypes = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
 const api = require("../../.../../api");
@@ -324,3 +324,25 @@ function discoverTrigger(endpoint, region, r) {
     }
     (0, functional_1.assertExhaustive)(endpoint);
 }
+function applyPrefix(build, prefix) {
+    if (!prefix) {
+        return;
+    }
+    const newEndpoints = {};
+    for (const [id, endpoint] of Object.entries(build.endpoints)) {
+        const newId = `${prefix}-${id}`;
+        if (newId.length > 63) {
+            throw new error_1.FirebaseError(`Function id '${newId}' exceeds 63 characters after applying prefix '${prefix}'. Please shorten the prefix or function name.`);
+        }
+        const fnIdRegex = /^[a-zA-Z][a-zA-Z0-9_-]{0,62}$/;
+        if (!fnIdRegex.test(newId)) {
+            throw new error_1.FirebaseError(`Function id '${newId}' is invalid after applying prefix '${prefix}'. Function names must start with a letter and can contain letters, numbers, underscores, and hyphens, with a maximum length of 63 characters.`);
+        }
+        newEndpoints[newId] = endpoint;
+        if (endpoint.secretEnvironmentVariables) {
+            endpoint.secretEnvironmentVariables = endpoint.secretEnvironmentVariables.map((secret) => (Object.assign(Object.assign({}, secret), { secret: `${prefix}-${secret.secret}` })));
+        }
+    }
+    build.endpoints = newEndpoints;
+}
+exports.applyPrefix = applyPrefix;

package/lib/deploy/functions/ensure.js

@@ -23,7 +23,7 @@ async function defaultServiceAccount(e) {
     if (e.platform === "gcfv1") {
         return `${metadata.projectId}@appspot.gserviceaccount.com`;
     }
-    else if (e.platform === "gcfv2") {
+    else if (e.platform === "gcfv2" || e.platform === "run") {
         return await (0, computeEngine_1.getDefaultServiceAccount)(metadata.projectNumber);
     }
     (0, functional_1.assertExhaustive)(e.platform);

package/lib/deploy/functions/functionsDeployHelper.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEndpointFiltered = exports.isCodebaseFiltered = exports.groupEndpointsByCodebase = exports.targetCodebases = exports.getFunctionLabel = exports.getHumanFriendlyPlatformName = exports.getEndpointFilters = exports.parseFunctionSelector = exports.endpointMatchesFilter = exports.endpointMatchesAnyFilter = void 0;
 const backend = require("./backend");
 const projectConfig_1 = require("../../functions/projectConfig");
+const functional_1 = require("../../functional");
 function endpointMatchesAnyFilter(endpoint, filters) {
     if (!filters) {
         return true;
@@ -71,7 +72,13 @@ function getHumanFriendlyPlatformName(platform) {
     if (platform === "gcfv1") {
         return "1st Gen";
     }
-    return "2nd Gen";
+    else if (platform === "gcfv2") {
+        return "2nd Gen";
+    }
+    else if (platform === "run") {
+        return "Cloud Run";
+    }
+    (0, functional_1.assertExhaustive)(platform);
 }
 exports.getHumanFriendlyPlatformName = getHumanFriendlyPlatformName;
 function getFunctionLabel(fn) {

package/lib/deploy/functions/prepare.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureAllRequiredAPIsEnabled = exports.warnIfNewGenkitFunctionIsMissingSecrets = exports.loadCodebases = exports.resolveCpuAndConcurrency = exports.inferBlockingDetails = exports.updateEndpointTargetedStatus = exports.inferDetailsFromExisting = exports.prepare = exports.EVENTARC_SOURCE_ENV = void 0;
 const clc = require("colorette");
+const proto = require("../../gcp/proto");
 const backend = require("./backend");
 const build = require("./build");
 const ensureApiEnabled = require("../../ensureApiEnabled");
@@ -76,6 +77,7 @@ async function prepare(context, options, payload) {
             projectId: projectId,
             projectAlias: options.projectAlias,
         };
+        proto.convertIfPresent(userEnvOpt, config, "configDir", (cd) => options.config.path(cd));
         const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
         const envs = Object.assign(Object.assign({}, userEnvs), firebaseEnvs);
         const { backend: wantBackend, envs: resolvedEnvs } = await build.resolveBackend({
@@ -99,12 +101,12 @@ async function prepare(context, options, payload) {
             }
         }
         for (const endpoint of backend.allEndpoints(wantBackend)) {
-            endpoint.environmentVariables = Object.assign({}, wantBackend.environmentVariables) || {};
+            endpoint.environmentVariables = Object.assign({}, (wantBackend.environmentVariables || {}));
             let resource;
             if (endpoint.platform === "gcfv1") {
                 resource = `projects/${endpoint.project}/locations/${endpoint.region}/functions/${endpoint.id}`;
             }
-            else if (endpoint.platform === "gcfv2") {
+            else if (endpoint.platform === "gcfv2" || endpoint.platform === "run") {
                 resource = `projects/${endpoint.project}/locations/${endpoint.region}/services/${endpoint.id}`;
             }
             else {
@@ -309,8 +311,10 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         await runtimeDelegate.build();
         const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
         (0, utils_1.logLabeledBullet)("functions", `Loading and analyzing source code for codebase ${codebase} to determine what to deploy`);
-        wantBuilds[codebase] = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
-        wantBuilds[codebase].runtime = codebaseConfig.runtime;
+        const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
+        discoveredBuild.runtime = codebaseConfig.runtime;
+        build.applyPrefix(discoveredBuild, codebaseConfig.prefix || "");
+        wantBuilds[codebase] = discoveredBuild;
     }
     return wantBuilds;
 }

package/lib/deploy/functions/pricing.js

@@ -130,6 +130,7 @@ function monthlyMinInstanceCost(endpoints) {
     const usage = {
         gcfv1: { 1: { ram: 0, cpu: 0 }, 2: { ram: 0, cpu: 0 } },
         gcfv2: { 1: { ram: 0, cpu: 0 }, 2: { ram: 0, cpu: 0 } },
+        run: { 1: { ram: 0, cpu: 0 }, 2: { ram: 0, cpu: 0 } },
     };
     for (const endpoint of endpoints) {
         if (endpoint.minInstances === undefined || endpoint.minInstances === null) {
@@ -147,10 +148,10 @@ function monthlyMinInstanceCost(endpoints) {
         }
         else {
             const tier = V2_REGION_TO_TIER[endpoint.region];
-            usage["gcfv2"][tier].ram =
-                usage["gcfv2"][tier].ram + ramGb * SECONDS_PER_MONTH * endpoint.minInstances;
-            usage["gcfv2"][tier].cpu =
-                usage["gcfv2"][tier].cpu +
+            usage[endpoint.platform][tier].ram =
+                usage[endpoint.platform][tier].ram + ramGb * SECONDS_PER_MONTH * endpoint.minInstances;
+            usage[endpoint.platform][tier].cpu =
+                usage[endpoint.platform][tier].cpu +
                     endpoint.cpu * SECONDS_PER_MONTH * endpoint.minInstances;
         }
     }
@@ -166,6 +167,12 @@ function monthlyMinInstanceCost(endpoints) {
     let v2CpuBill = usage["gcfv2"][1].cpu * exports.V2_RATES.idleVCpu[1] + usage["gcfv2"][2].cpu * exports.V2_RATES.idleVCpu[2];
     v2CpuBill -= exports.V2_FREE_TIER.vCpu * exports.V2_RATES.vCpu[1];
     v2CpuBill = Math.max(v2CpuBill, 0);
-    return v1MemoryBill + v1CpuBill + v2MemoryBill + v2CpuBill;
+    let runMemoryBill = usage["run"][1].ram * exports.V2_RATES.memoryGb[1] + usage["run"][2].ram * exports.V2_RATES.memoryGb[2];
+    runMemoryBill -= exports.V2_FREE_TIER.memoryGb * exports.V2_RATES.memoryGb[1];
+    runMemoryBill = Math.max(runMemoryBill, 0);
+    let runCpuBill = usage["run"][1].cpu * exports.V2_RATES.idleVCpu[1] + usage["run"][2].cpu * exports.V2_RATES.idleVCpu[2];
+    runCpuBill -= exports.V2_FREE_TIER.vCpu * exports.V2_RATES.vCpu[1];
+    runCpuBill = Math.max(runCpuBill, 0);
+    return v1MemoryBill + v1CpuBill + v2MemoryBill + v2CpuBill + runMemoryBill + runCpuBill;
 }
 exports.monthlyMinInstanceCost = monthlyMinInstanceCost;

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

@@ -136,6 +136,11 @@ class Fabricator {
         else if (endpoint.platform === "gcfv2") {
             await this.createV2Function(endpoint, scraperV2);
         }
+        else if (endpoint.platform === "run") {
+            throw new error_1.FirebaseError("Creating new Cloud Run functions is not supported yet.", {
+                exit: 1,
+            });
+        }
         else {
             (0, functional_1.assertExhaustive)(endpoint.platform);
         }
@@ -154,6 +159,9 @@ class Fabricator {
         else if (update.endpoint.platform === "gcfv2") {
             await this.updateV2Function(update.endpoint, scraperV2);
         }
+        else if (update.endpoint.platform === "run") {
+            throw new error_1.FirebaseError("Updating Cloud Run functions is not supported yet.", { exit: 1 });
+        }
         else {
             (0, functional_1.assertExhaustive)(update.endpoint.platform);
         }
@@ -162,11 +170,15 @@ class Fabricator {
     async deleteEndpoint(endpoint) {
         await this.deleteTrigger(endpoint);
         if (endpoint.platform === "gcfv1") {
-            await this.deleteV1Function(endpoint);
+            return this.deleteV1Function(endpoint);
         }
-        else {
-            await this.deleteV2Function(endpoint);
+        else if (endpoint.platform === "gcfv2") {
+            return this.deleteV2Function(endpoint);
         }
+        else if (endpoint.platform === "run") {
+            throw new error_1.FirebaseError("Deleting Cloud Run functions is not supported yet.", { exit: 1 });
+        }
+        (0, functional_1.assertExhaustive)(endpoint.platform);
     }
     async createV1Function(endpoint, scraper) {
         var _a, _b;
@@ -471,6 +483,11 @@ class Fabricator {
             .catch(rethrowAs(endpoint, "set concurrency"));
     }
     async setTrigger(endpoint) {
+        if (endpoint.platform === "run") {
+            throw new error_1.FirebaseError("Setting triggers for Cloud Run functions is not supported yet.", {
+                exit: 1,
+            });
+        }
         if (backend.isScheduleTriggered(endpoint)) {
             if (endpoint.platform === "gcfv1") {
                 await this.upsertScheduleV1(endpoint);
@@ -490,6 +507,11 @@ class Fabricator {
         }
     }
     async deleteTrigger(endpoint) {
+        if (endpoint.platform === "run") {
+            throw new error_1.FirebaseError("Deleting triggers for Cloud Run functions is not supported yet.", {
+                exit: 1,
+            });
+        }
         if (backend.isScheduleTriggered(endpoint)) {
             if (endpoint.platform === "gcfv1") {
                 await this.deleteScheduleV1(endpoint);

package/lib/emulator/controller.js

@@ -5,6 +5,7 @@ const clc = require("colorette");
 const fs = require("fs");
 const path = require("path");
 const fsConfig = require("../firestore/fsConfig");
+const proto = require("../gcp/proto");
 const logger_1 = require("../logger");
 const track_1 = require("../track");
 const utils = require("../utils");
@@ -116,7 +117,7 @@ function shouldStart(options, name) {
             return true;
         }
         catch (err) {
-            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("WARN", "functions", `The functions emulator is configured but there is no functions source directory. Have you run ${clc.bold("firebase init functions")}?`);
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("ERROR", "functions", `Failed to start Functions emulator: ${err.message}`);
             return false;
         }
     }
@@ -344,15 +345,18 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             if (runtime && !(0, supported_1.isRuntime)(runtime)) {
                 throw new error_1.FirebaseError(`Cannot load functions from ${functionsDir} because it has invalid runtime ${runtime}`);
             }
-            emulatableBackends.push({
+            const backend = {
                 functionsDir,
                 runtime,
                 codebase: cfg.codebase,
+                prefix: cfg.prefix,
                 env: Object.assign({}, options.extDevEnv),
                 secretEnv: [],
                 predefinedTriggers: options.extDevTriggers,
                 ignore: cfg.ignore,
-            });
+            };
+            proto.convertIfPresent(backend, cfg, "configDir", (cd) => path.join(projectDir, cd));
+            emulatableBackends.push(backend);
         }
     }
     if (extensionEmulator) {

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.11.1",
-            "expectedSize": 29352800,
-            "expectedChecksum": "52d86a5546bbb9e2fcd67faa90b9f07e",
-            "expectedChecksumSHA256": "217b66589c32d4378201100fa968e69f7c94537044b892be1aaa14d7f6ce6b12",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.11.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1"
+            "version": "2.11.2",
+            "expectedSize": 29447008,
+            "expectedChecksum": "13bc7d3bb0a0bbfe601991361e4413c2",
+            "expectedChecksumSHA256": "e3b029eb461f0fe6f0c825c7a71d42c7a09c2b8ee4fac10c3e187d78fe5083f6",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.11.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2"
         },
         "win32": {
-            "version": "2.11.1",
-            "expectedSize": 29841920,
-            "expectedChecksum": "704cee75ad2d384cf28ac1683c8d1179",
-            "expectedChecksumSHA256": "fadb5a1d0f03160c133389df9d452cc620cfdface041971a5356ac5a69e937ff",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.11.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1.exe"
+            "version": "2.11.2",
+            "expectedSize": 29934592,
+            "expectedChecksum": "032a0749781fc338b446d753dd543bf5",
+            "expectedChecksumSHA256": "2d0498b3ef94b4e777d6fc1d526279376caf3842549f39f13a8ca327393bf810",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.11.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2.exe"
         },
         "linux": {
-            "version": "2.11.1",
-            "expectedSize": 29282488,
-            "expectedChecksum": "435656eab760033228bf7b7e77d56dde",
-            "expectedChecksumSHA256": "0abb33c0bba0ed8ef1394cc1cab5a333ec81b3dddf48aa625abe8ca28f38840e",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.11.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1"
+            "version": "2.11.2",
+            "expectedSize": 29368504,
+            "expectedChecksum": "065a7523f881952040ac678a9a1e9323",
+            "expectedChecksumSHA256": "41ca6561cf77107b5d1d829233844d21c46a5e4bb823c150b1b32591dc2463e0",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.11.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2"
         }
     }
 }

package/lib/emulator/functionsEmulator.js

@@ -28,8 +28,9 @@ const utils_1 = require("../utils");
 const adminSdkConfig_1 = require("./adminSdkConfig");
 const validate_1 = require("../deploy/functions/validate");
 const secretManager_1 = require("../gcp/secretManager");
-const runtimes = require("../deploy/functions/runtimes");
 const backend = require("../deploy/functions/backend");
+const build = require("../deploy/functions/build");
+const runtimes = require("../deploy/functions/runtimes");
 const functionsEnv = require("../functions/env");
 const v1_1 = require("../functions/events/v1");
 const build_1 = require("../deploy/functions/build");
@@ -82,6 +83,7 @@ class FunctionsEmulator {
         this.blockingFunctionsConfig = {};
         this.staticBackends = [];
         this.dynamicBackends = [];
+        this.watchers = [];
         this.debugMode = false;
         this.staticBackends = args.emulatableBackends;
         emulatorLogger_1.EmulatorLogger.setVerbosity(this.args.verbosity ? emulatorLogger_1.Verbosity[this.args.verbosity] : emulatorLogger_1.Verbosity["DEBUG"]);
@@ -271,6 +273,7 @@ class FunctionsEmulator {
                 ],
                 persistent: true,
             });
+            this.watchers.push(watcher);
             const debouncedLoadTriggers = (0, utils_1.debounce)(() => this.loadTriggers(backend), 1000);
             watcher.on("change", (filePath) => {
                 this.logger.log("DEBUG", `File ${filePath} changed, reloading triggers`);
@@ -292,6 +295,10 @@ class FunctionsEmulator {
         for (const pool of Object.values(this.workerPools)) {
             pool.exit();
         }
+        for (const watcher of this.watchers) {
+            await watcher.close();
+        }
+        this.watchers = [];
         if (this.destroyServer) {
             await this.destroyServer();
         }
@@ -322,6 +329,7 @@ class FunctionsEmulator {
                 projectId: this.args.projectId,
                 projectAlias: this.args.projectAlias,
                 isEmulator: true,
+                configDir: emulatableBackend.configDir,
             };
             const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
             const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, environment);
@@ -329,6 +337,7 @@ class FunctionsEmulator {
                 await this.args.extensionsEmulator.addDynamicExtensions(emulatableBackend.codebase, discoveredBuild);
                 await this.loadDynamicExtensionBackends();
             }
+            build.applyPrefix(discoveredBuild, emulatableBackend.prefix || "");
             const resolution = await (0, build_1.resolveBackend)({
                 build: discoveredBuild,
                 firebaseConfig: JSON.parse(firebaseConfig),
@@ -871,6 +880,7 @@ class FunctionsEmulator {
     getUserEnvs(backend) {
         const projectInfo = {
             functionsSource: backend.functionsDir,
+            configDir: backend.configDir,
             projectId: this.args.projectId,
             projectAlias: this.args.projectAlias,
             isEmulator: true,

package/lib/experiments.js

@@ -48,6 +48,10 @@ exports.ALL_EXPERIMENTS = experiments({
         default: true,
         public: true,
     },
+    runfunctions: {
+        shortDescription: "Functions created using the V2 API target Cloud Run Functions (not production ready)",
+        public: false,
+    },
     emulatoruisnapshot: {
         shortDescription: "Load pre-release versions of the emulator UI",
     },

package/lib/extensions/extensionsHelper.js

@@ -7,7 +7,7 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.checkExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOPULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
+exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.checkExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOPULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
 const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
@@ -21,10 +21,8 @@ const unzip_1 = require("./../unzip");
 marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const api_1 = require("../api");
 const archiveDirectory_1 = require("../archiveDirectory");
-const utils_1 = require("./utils");
 const functionsConfig_1 = require("../functionsConfig");
 const adminSdkConfig_1 = require("../emulator/adminSdkConfig");
-const resolveSource_1 = require("./resolveSource");
 const error_1 = require("../error");
 const diagnose_1 = require("./diagnose");
 const askUserForParam_1 = require("./askUserForParam");
@@ -37,7 +35,7 @@ const prompt_1 = require("../prompt");
 const refs = require("./refs");
 const localHelper_1 = require("./localHelper");
 const logger_1 = require("../logger");
-const utils_2 = require("../utils");
+const utils_1 = require("../utils");
 const change_log_1 = require("./change-log");
 const getProjectNumber_1 = require("../getProjectNumber");
 const constants_1 = require("../emulator/constants");
@@ -61,7 +59,7 @@ var SourceOrigin;
 exports.logPrefix = "extensions";
 const VALID_LICENSES = ["apache-2.0"];
 exports.URL_REGEX = /^https:/;
-exports.EXTENSIONS_BUCKET_NAME = (0, utils_2.envOverride)("FIREBASE_EXTENSIONS_UPLOAD_BUCKET", "firebase-ext-eap-uploads");
+exports.EXTENSIONS_BUCKET_NAME = (0, utils_1.envOverride)("FIREBASE_EXTENSIONS_UPLOAD_BUCKET", "firebase-ext-eap-uploads");
 const AUTOPOPULATED_PARAM_NAMES = [
     "PROJECT_ID",
     "STORAGE_BUCKET",
@@ -104,7 +102,7 @@ async function getFirebaseProjectParams(projectId, emulatorMode = false) {
             projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
         }
         catch (err) {
-            (0, utils_2.logLabeledError)("extensions", `Unable to look up project number for ${projectId}.\n` +
+            (0, utils_1.logLabeledError)("extensions", `Unable to look up project number for ${projectId}.\n` +
                 " If this is a real project, ensure that you are logged in and have access to it.\n" +
                 " If this is a fake project, please use a project ID starting with 'demo-' to skip production calls.\n" +
                 " Continuing with a fake project number - secrets and other features that require production access may behave unexpectedly.");
@@ -810,15 +808,6 @@ function displayReleaseNotes(args) {
     logger_1.logger.info(message);
 }
 exports.displayReleaseNotes = displayReleaseNotes;
-async function promptForOfficialExtension(message) {
-    const officialExts = await (0, resolveSource_1.getExtensionRegistry)(true);
-    return await (0, prompt_1.select)({
-        message,
-        choices: (0, utils_1.convertOfficialExtensionsToList)(officialExts),
-        pageSize: Object.keys(officialExts).length,
-    });
-}
-exports.promptForOfficialExtension = promptForOfficialExtension;
 async function promptForRepeatInstance(projectName, extensionName) {
     const message = `An extension with the ID '${clc.bold(extensionName)}' already exists in the project '${clc.bold(projectName)}'. What would you like to do?`;
     return await (0, prompt_1.select)({