firebase-tools 10.8.0 → 10.9.2

package/lib/commands/functions-list.js

@@ -5,7 +5,6 @@ const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
 const requirePermissions_1 = require("../requirePermissions");
 const backend = require("../deploy/functions/backend");
-const previews_1 = require("../previews");
 const logger_1 = require("../logger");
 const Table = require("cli-table");
 exports.default = new command_1.Command("functions:list")
@@ -18,28 +17,21 @@ exports.default = new command_1.Command("functions:list")
         };
         const existing = await backend.existingBackend(context);
         const endpointsList = backend.allEndpoints(existing).sort(backend.compareFunctions);
-        const table = previews_1.previews.functionsv2
-            ? new Table({
-                head: ["Function", "Version", "Trigger", "Location", "Memory", "Runtime"],
-                style: { head: ["yellow"] },
-            })
-            : new Table({
-                head: ["Function", "Trigger", "Location", "Memory", "Runtime"],
-                style: { head: ["yellow"] },
-            });
+        const table = new Table({
+            head: ["Function", "Version", "Trigger", "Location", "Memory", "Runtime"],
+            style: { head: ["yellow"] },
+        });
         for (const endpoint of endpointsList) {
             const trigger = backend.endpointTriggerType(endpoint);
             const availableMemoryMb = endpoint.availableMemoryMb || "---";
-            const entry = previews_1.previews.functionsv2
-                ? [
-                    endpoint.id,
-                    endpoint.platform === "gcfv2" ? "v2" : "v1",
-                    trigger,
-                    endpoint.region,
-                    availableMemoryMb,
-                    endpoint.runtime,
-                ]
-                : [endpoint.id, trigger, endpoint.region, availableMemoryMb, endpoint.runtime];
+            const entry = [
+                endpoint.id,
+                endpoint.platform === "gcfv2" ? "v2" : "v1",
+                trigger,
+                endpoint.region,
+                availableMemoryMb,
+                endpoint.runtime,
+            ];
             table.push(entry);
         }
         logger_1.logger.info(table.toString());

package/lib/deploy/functions/backend.js

@@ -6,7 +6,6 @@ const gcfV2 = require("../../gcp/cloudfunctionsv2");
 const run = require("../../gcp/run");
 const utils = require("../../utils");
 const error_1 = require("../../error");
-const previews_1 = require("../../previews");
 const functional_1 = require("../../functional");
 function endpointTriggerType(endpoint) {
     if (isScheduleTriggered(endpoint)) {
@@ -192,9 +191,6 @@ async function loadExistingBackend(ctx) {
         ctx.existingBackend.endpoints[endpoint.region][endpoint.id] = endpoint;
     }
     ctx.unreachableRegions.gcfV1 = gcfV1Results.unreachable;
-    if (!previews_1.previews.functionsv2) {
-        return;
-    }
     let gcfV2Results;
     try {
         gcfV2Results = await gcfV2.listAllFunctions(ctx.projectId);

package/lib/deploy/functions/prepare.js

@@ -108,15 +108,6 @@ async function prepare(context, options, payload) {
             (0, utils_1.logLabeledBullet)("functions", `preparing ${clc.bold(sourceDirName)} directory for uploading...`);
         }
         if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
-            if (!previews_1.previews.functionsv2) {
-                throw new error_1.FirebaseError("This version of firebase-tools does not support Google Cloud " +
-                    "Functions gen 2\n" +
-                    "If Cloud Functions for Firebase gen 2 is still in alpha, sign up " +
-                    "for the alpha program at " +
-                    "https://services.google.com/fb/forms/firebasealphaprogram/\n" +
-                    "If Cloud Functions for Firebase gen 2 is in beta, get the latest " +
-                    "version of Firebse Tools with `npm i -g firebase-tools@latest`");
-            }
             source.functionsSourceV2 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, config);
         }
         if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {

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

@@ -71,7 +71,8 @@ async function detectFromPort(port, project, runtime, timeout = 30000) {
         parsed = yaml.load(text);
     }
     catch (err) {
-        throw new error_1.FirebaseError("Failed to parse backend specification", { children: [err] });
+        logger_1.logger.debug("Failed to parse functions.yaml", err);
+        throw new error_1.FirebaseError(`Failed to load function definition from source: ${text}`);
     }
     return yamlToBackend(parsed, project, api.functionsDefaultRegion, runtime);
 }

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

@@ -189,16 +189,15 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             runtime, entryPoint: ep.entryPoint }, triggered);
         (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "cpu");
         (0, proto_1.renameIfPresent)(parsed, ep, "secretEnvironmentVariables", "secretEnvironmentVariables", (senvs) => {
-            if (senvs && senvs.length > 0) {
-                ep.secretEnvironmentVariables = [];
-                for (const { key, secret } of senvs) {
-                    ep.secretEnvironmentVariables.push({
-                        key,
-                        secret: secret || key,
-                        projectId: project,
-                    });
-                }
+            const secretEnvironmentVariables = [];
+            for (const { key, secret } of senvs) {
+                secretEnvironmentVariables.push({
+                    key,
+                    secret: secret || key,
+                    projectId: project,
+                });
             }
+            return secretEnvironmentVariables;
         });
         allParsed.push(parsed);
     }

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

@@ -11,7 +11,6 @@ const node_fetch_1 = require("node-fetch");
 const error_1 = require("../../../../error");
 const parseRuntimeAndValidateSDK_1 = require("./parseRuntimeAndValidateSDK");
 const logger_1 = require("../../../../logger");
-const previews_1 = require("../../../../previews");
 const utils_1 = require("../../../../utils");
 const discovery = require("../discovery");
 const validate = require("./validate");
@@ -58,10 +57,14 @@ class Delegate {
     watch() {
         return Promise.resolve(() => Promise.resolve());
     }
-    serve(port, envs) {
+    serve(port, config, envs) {
         var _a;
+        const env = Object.assign(Object.assign({}, envs), { PORT: port.toString(), FUNCTIONS_CONTROL_API: "true", HOME: process.env.HOME, PATH: process.env.PATH });
+        if (Object.keys(config || {}).length) {
+            env.CLOUD_RUNTIME_CONFIG = JSON.stringify(config);
+        }
         const childProcess = spawn("./node_modules/.bin/firebase-functions", [this.sourceDir], {
-            env: Object.assign(Object.assign({}, envs), { PORT: port.toString(), FUNCTIONS_CONTROL_API: "true", HOME: process.env.HOME, PATH: process.env.PATH }),
+            env,
             cwd: this.sourceDir,
             stdio: ["ignore", "pipe", "inherit"],
         });
@@ -83,32 +86,29 @@ class Delegate {
         });
     }
     async discoverSpec(config, env) {
-        if (previews_1.previews.functionsv2) {
-            if (!semver.valid(this.sdkVersion)) {
-                logger_1.logger.debug(`Could not parse firebase-functions version '${this.sdkVersion}' into semver. Falling back to parseTriggers.`);
-                return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
-            }
-            if (semver.lt(this.sdkVersion, MIN_FUNCTIONS_SDK_VERSION)) {
-                (0, utils_1.logLabeledWarning)("functions", `You are using an old version of firebase-functions SDK (${this.sdkVersion}). ` +
-                    `Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION}`);
-                return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
+        if (!semver.valid(this.sdkVersion)) {
+            logger_1.logger.debug(`Could not parse firebase-functions version '${this.sdkVersion}' into semver. Falling back to parseTriggers.`);
+            return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
+        }
+        if (semver.lt(this.sdkVersion, MIN_FUNCTIONS_SDK_VERSION)) {
+            (0, utils_1.logLabeledWarning)("functions", `You are using an old version of firebase-functions SDK (${this.sdkVersion}). ` +
+                `Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION}`);
+            return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
+        }
+        let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
+        if (!discovered) {
+            const getPort = (0, util_1.promisify)(portfinder.getPort);
+            const port = await getPort();
+            const kill = await this.serve(port, config, env);
+            try {
+                discovered = await discovery.detectFromPort(port, this.projectId, this.runtime);
             }
-            let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
-            if (!discovered) {
-                const getPort = (0, util_1.promisify)(portfinder.getPort);
-                const port = await getPort();
-                const kill = await this.serve(port, env);
-                try {
-                    discovered = await discovery.detectFromPort(port, this.projectId, this.runtime);
-                }
-                finally {
-                    await kill();
-                }
+            finally {
+                await kill();
             }
-            discovered.environmentVariables = env;
-            return discovered;
         }
-        return parseTriggers.discoverBackend(this.projectId, this.sourceDir, this.runtime, config, env);
+        discovered.environmentVariables = env;
+        return discovered;
     }
     async discoverBuild(config, env) {
         return parseTriggers.discoverBuild(this.projectId, this.sourceDir, this.runtime, config, env);

package/lib/deploy/functions/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.secretsAreValid = exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreUnique = exports.endpointsAreValid = void 0;
+exports.secretsAreValid = exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreUnique = exports.cpuConfigIsValid = exports.endpointsAreValid = void 0;
 const path = require("path");
 const clc = require("cli-color");
 const error_1 = require("../../error");
@@ -11,61 +11,98 @@ const backend = require("./backend");
 const utils = require("../../utils");
 const secrets = require("../../functions/secrets");
 const services_1 = require("./services");
+function matchingIds(endpoints, filter) {
+    return endpoints
+        .filter(filter)
+        .map((endpoint) => endpoint.id)
+        .join(",");
+}
+const mem = (endpoint) => endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
+const cpu = (endpoint) => {
+    var _a;
+    return endpoint.cpu === "gcf_gen1"
+        ? backend.memoryToGen1Cpu(mem(endpoint))
+        : (_a = endpoint.cpu) !== null && _a !== void 0 ? _a : backend.memoryToGen2Cpu(mem(endpoint));
+};
 function endpointsAreValid(wantBackend) {
     const endpoints = backend.allEndpoints(wantBackend);
     functionIdsAreValid(endpoints);
     for (const ep of endpoints) {
         (0, services_1.serviceForEndpoint)(ep).validateTrigger(ep, wantBackend);
     }
-    const gcfV1WithConcurrency = endpoints
-        .filter((endpoint) => (endpoint.concurrency || 1) !== 1 && endpoint.platform === "gcfv1")
-        .map((endpoint) => endpoint.id);
+    const gcfV1WithConcurrency = matchingIds(endpoints, (endpoint) => (endpoint.concurrency || 1) !== 1 && endpoint.platform === "gcfv1");
     if (gcfV1WithConcurrency.length) {
-        const msg = `Cannot set concurrency on the functions ${gcfV1WithConcurrency.join(",")} because they are GCF gen 1`;
+        const msg = `Cannot set concurrency on the functions ${gcfV1WithConcurrency} because they are GCF gen 1`;
         throw new error_1.FirebaseError(msg);
     }
-    const tooSmallForConcurrency = endpoints
-        .filter((endpoint) => {
+    const tooSmallForConcurrency = matchingIds(endpoints, (endpoint) => {
         if ((endpoint.concurrency || 1) === 1) {
             return false;
         }
-        return endpoint.cpu < backend.MIN_CPU_FOR_CONCURRENCY;
-    })
-        .map((endpoint) => endpoint.id);
+        return cpu(endpoint) < backend.MIN_CPU_FOR_CONCURRENCY;
+    });
     if (tooSmallForConcurrency.length) {
         const msg = "The following functions are configured to allow concurrent " +
             "execution and less than one full CPU. This is not supported: " +
-            tooSmallForConcurrency.join(",");
+            tooSmallForConcurrency;
         throw new error_1.FirebaseError(msg);
     }
-    const gcfV1WithCPU = endpoints
-        .filter((endpoint) => endpoint.platform === "gcfv1" && typeof endpoint["cpu"] !== "undefined")
-        .map((endpoint) => endpoint.id);
+    cpuConfigIsValid(endpoints);
+}
+exports.endpointsAreValid = endpointsAreValid;
+function cpuConfigIsValid(endpoints) {
+    const gcfV1WithCPU = matchingIds(endpoints, (endpoint) => endpoint.platform === "gcfv1" && typeof endpoint["cpu"] !== "undefined");
     if (gcfV1WithCPU.length) {
-        const msg = `Cannot set CPU on the functions ${gcfV1WithCPU.join(",")} because they are GCF gen 1`;
+        const msg = `Cannot set CPU on the functions ${gcfV1WithCPU} because they are GCF gen 1`;
         throw new error_1.FirebaseError(msg);
     }
-    const invalidCPU = endpoints
-        .filter((endpoint) => {
-        if (typeof endpoint.cpu === "undefined") {
-            return false;
+    const invalidCPU = matchingIds(endpoints, (endpoint) => {
+        const c = cpu(endpoint);
+        if (c < 0.08) {
+            return true;
         }
-        if (endpoint.cpu === "gcf_gen1") {
+        if (c < 1) {
             return false;
         }
-        const cpu = endpoint.cpu;
-        if (cpu < 1) {
-            return false;
-        }
-        return ![1, 2, 4, 6, 8].includes(cpu);
-    })
-        .map((endpoint) => endpoint.id);
+        return ![1, 2, 4, 6, 8].includes(c);
+    });
     if (invalidCPU.length) {
-        const msg = `The following functions have invalid CPU settings ${invalidCPU.join(",")}. Valid CPU options are (0, 1], 2, 4, 6, 8, or "gcf_gen1"`;
+        const msg = `The following functions have invalid CPU settings ${invalidCPU}. Valid CPU options are (0.08, 1], 2, 4, 6, 8, or "gcf_gen1"`;
+        throw new error_1.FirebaseError(msg);
+    }
+    const smallCPURegions = ["australia-southeast2", "asia-northeast3", "asia-south2"];
+    const tooBigCPUForRegion = matchingIds(endpoints, (endpoint) => smallCPURegions.includes(endpoint.region) && cpu(endpoint) > 4);
+    if (tooBigCPUForRegion) {
+        const msg = `The functions ${tooBigCPUForRegion} have > 4 CPU in a region that supports a maximum 4 CPU`;
+        throw new error_1.FirebaseError(msg);
+    }
+    const tooSmallCPUSmall = matchingIds(endpoints, (endpoint) => mem(endpoint) > 512 && cpu(endpoint) < 0.5);
+    if (tooSmallCPUSmall) {
+        const msg = `The functions ${tooSmallCPUSmall} have too little CPU for their memory allocation. A minimum of 0.5 CPU is needed to set a memory limit greater than 512MiB`;
+        throw new error_1.FirebaseError(msg);
+    }
+    const tooSmallCPUBig = matchingIds(endpoints, (endpoint) => mem(endpoint) > 1024 && cpu(endpoint) < 1);
+    if (tooSmallCPUBig) {
+        const msg = `The functions ${tooSmallCPUSmall} have too little CPU for their memory allocation. A minimum of 1 CPU is needed to set a memory limit greater than 1GiB`;
+        throw new error_1.FirebaseError(msg);
+    }
+    const tooSmallMemory4CPU = matchingIds(endpoints, (endpoint) => cpu(endpoint) === 4 && mem(endpoint) < 2 << 10);
+    if (tooSmallMemory4CPU) {
+        const msg = `The functions ${tooSmallMemory4CPU} have too little memory for their CPU. Functions with 4 CPU require at least 2GiB`;
+        throw new error_1.FirebaseError(msg);
+    }
+    const tooSmallMemory6CPU = matchingIds(endpoints, (endpoint) => cpu(endpoint) === 6 && mem(endpoint) < 3 << 10);
+    if (tooSmallMemory6CPU) {
+        const msg = `The functions ${tooSmallMemory6CPU} have too little memory for their CPU. Functions with 6 CPU require at least 3GiB`;
+        throw new error_1.FirebaseError(msg);
+    }
+    const tooSmallMemory8CPU = matchingIds(endpoints, (endpoint) => cpu(endpoint) === 8 && mem(endpoint) < 4 << 10);
+    if (tooSmallMemory8CPU) {
+        const msg = `The functions ${tooSmallMemory8CPU} have too little memory for their CPU. Functions with 8 CPU require at least 4GiB`;
         throw new error_1.FirebaseError(msg);
     }
 }
-exports.endpointsAreValid = endpointsAreValid;
+exports.cpuConfigIsValid = cpuConfigIsValid;
 function endpointsAreUnique(backends) {
     const endpointToCodebases = {};
     for (const [codebase, b] of Object.entries(backends)) {

package/lib/deploy/index.js

@@ -18,6 +18,7 @@ const FunctionsTarget = require("./functions");
 const StorageTarget = require("./storage");
 const RemoteConfigTarget = require("./remoteconfig");
 const ExtensionsTarget = require("./extensions");
+const frameworks_1 = require("../frameworks");
 const TARGETS = {
     hosting: HostingTarget,
     database: DatabaseTarget,
@@ -45,7 +46,7 @@ const deploy = async function (targetNames, options, customContext = {}) {
     if (previews_1.previews.frameworkawareness && targetNames.includes("hosting")) {
         const config = options.config.get("hosting");
         if (Array.isArray(config) ? config.some((it) => it.source) : config.source) {
-            await require("firebase-frameworks").prepare(targetNames, context, options);
+            await (0, frameworks_1.prepareFrameworks)(targetNames, context, options);
         }
     }
     for (const targetName of targetNames) {

package/lib/emulator/controller.js

@@ -37,9 +37,10 @@ const config_1 = require("./storage/rules/config");
 const getDefaultDatabaseInstance_1 = require("../getDefaultDatabaseInstance");
 const auth_2 = require("../auth");
 const extensionsEmulator_1 = require("./extensionsEmulator");
-const previews_1 = require("../previews");
 const projectConfig_1 = require("../functions/projectConfig");
 const downloadableEmulators_1 = require("./downloadableEmulators");
+const frameworks_1 = require("../frameworks");
+const previews_1 = require("../previews");
 const START_LOGGING_EMULATOR = utils.envOverride("START_LOGGING_EMULATOR", "false", (val) => val === "true");
 async function getAndCheckAddress(emulator, options) {
     var _a, _b, _c, _d;
@@ -125,9 +126,7 @@ async function cleanShutdown() {
 exports.cleanShutdown = cleanShutdown;
 function filterEmulatorTargets(options) {
     let targets = [...types_1.ALL_SERVICE_EMULATORS];
-    if (previews_1.previews.extensionsemulator) {
-        targets.push(types_1.Emulators.EXTENSIONS);
-    }
+    targets.push(types_1.Emulators.EXTENSIONS);
     targets = targets.filter((e) => {
         return options.config.has(e) || options.config.has(`emulators.${e}`);
     });
@@ -245,6 +244,12 @@ async function startAll(options, showUI = true) {
             }
         }
     }
+    if (previews_1.previews.frameworkawareness) {
+        const config = options.config.get("hosting");
+        if (Array.isArray(config) ? config.some((it) => it.source) : config.source) {
+            await (0, frameworks_1.prepareFrameworks)(targets, options, options);
+        }
+    }
     if (shouldStart(options, types_1.Emulators.HUB)) {
         const hubAddr = await getAndCheckAddress(types_1.Emulators.HUB, options);
         const hub = new hub_1.EmulatorHub(Object.assign({ projectId }, hubAddr));
@@ -282,7 +287,7 @@ async function startAll(options, showUI = true) {
             });
         }
     }
-    if (shouldStart(options, types_1.Emulators.EXTENSIONS) && previews_1.previews.extensionsemulator) {
+    if (shouldStart(options, types_1.Emulators.EXTENSIONS)) {
         const projectNumber = constants_1.Constants.isDemoProject(projectId)
             ? constants_1.Constants.FAKE_PROJECT_NUMBER
             : await (0, projectUtils_1.needProjectNumber)(options);

package/lib/emulator/downloadableEmulators.js

@@ -50,15 +50,15 @@ exports.DownloadDetails = {
             namePrefix: "cloud-storage-rules-emulator",
         },
     },
-    ui: previews_1.previews.extensionsemulator
+    ui: previews_1.previews.emulatoruisnapshot
         ? {
-            version: "EXTENSIONS",
-            downloadPath: path.join(CACHE_DIR, "ui-vEXTENSIONS.zip"),
-            unzipDir: path.join(CACHE_DIR, "ui-vEXTENSIONS"),
-            binaryPath: path.join(CACHE_DIR, "ui-vEXTENSIONS", "server.bundle.js"),
+            version: "SNAPSHOT",
+            downloadPath: path.join(CACHE_DIR, "ui-vSNAPSHOT.zip"),
+            unzipDir: path.join(CACHE_DIR, "ui-vSNAPSHOT"),
+            binaryPath: path.join(CACHE_DIR, "ui-vSNAPSHOT", "server.bundle.js"),
             opts: {
                 cacheDir: CACHE_DIR,
-                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-vEXTENSIONS.zip",
+                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-vSNAPSHOT.zip",
                 expectedSize: -1,
                 expectedChecksum: "",
                 skipCache: true,
@@ -66,35 +66,19 @@ exports.DownloadDetails = {
                 namePrefix: "ui",
             },
         }
-        : previews_1.previews.emulatoruisnapshot
-            ? {
-                version: "SNAPSHOT",
-                downloadPath: path.join(CACHE_DIR, "ui-vSNAPSHOT.zip"),
-                unzipDir: path.join(CACHE_DIR, "ui-vSNAPSHOT"),
-                binaryPath: path.join(CACHE_DIR, "ui-vSNAPSHOT", "server.bundle.js"),
-                opts: {
-                    cacheDir: CACHE_DIR,
-                    remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-vSNAPSHOT.zip",
-                    expectedSize: -1,
-                    expectedChecksum: "",
-                    skipCache: true,
-                    skipChecksumAndSize: true,
-                    namePrefix: "ui",
-                },
-            }
-            : {
-                version: "1.6.6",
-                downloadPath: path.join(CACHE_DIR, "ui-v1.6.6.zip"),
-                unzipDir: path.join(CACHE_DIR, "ui-v1.6.6"),
-                binaryPath: path.join(CACHE_DIR, "ui-v1.6.6", "server.bundle.js"),
-                opts: {
-                    cacheDir: CACHE_DIR,
-                    remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.6.6.zip",
-                    expectedSize: 3817247,
-                    expectedChecksum: "c80a3f0ae1e3f682ace0a18a9cdd2861",
-                    namePrefix: "ui",
-                },
+        : {
+            version: "1.7.0",
+            downloadPath: path.join(CACHE_DIR, "ui-v1.7.0.zip"),
+            unzipDir: path.join(CACHE_DIR, "ui-v1.7.0"),
+            binaryPath: path.join(CACHE_DIR, "ui-v1.7.0", "server.bundle.js"),
+            opts: {
+                cacheDir: CACHE_DIR,
+                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.7.0.zip",
+                expectedSize: 4053708,
+                expectedChecksum: "aea9ae19091df5974a88a8847aaf127c",
+                namePrefix: "ui",
             },
+        },
     pubsub: {
         downloadPath: path.join(CACHE_DIR, "pubsub-emulator-0.1.0.zip"),
         version: "0.1.0",

package/lib/emulator/extensionsEmulator.js

@@ -65,7 +65,7 @@ class ExtensionsEmulator {
             if (!this.hasValidSource({ path: instance.localPath, extTarget: instance.localPath })) {
                 throw new error_1.FirebaseError(`Tried to emulate local extension at ${instance.localPath}, but it was missing required files.`);
             }
-            return instance.localPath;
+            return path.resolve(instance.localPath);
         }
         else if (instance.ref) {
             const ref = (0, refs_1.toExtensionVersionRef)(instance.ref);

package/lib/emulator/functionsEmulator.js

@@ -667,7 +667,10 @@ class FunctionsEmulator {
         envs.FUNCTIONS_EMULATOR = "true";
         envs.TZ = "UTC";
         envs.FIREBASE_DEBUG_MODE = "true";
-        envs.FIREBASE_DEBUG_FEATURES = JSON.stringify({ skipTokenVerification: true });
+        envs.FIREBASE_DEBUG_FEATURES = JSON.stringify({
+            skipTokenVerification: true,
+            enableCors: true,
+        });
         const firestoreEmulator = this.getEmulatorInfo(types_1.Emulators.FIRESTORE);
         if (firestoreEmulator != null) {
             envs[constants_1.Constants.FIRESTORE_EMULATOR_HOST] = (0, functionsEmulatorShared_1.formatHost)(firestoreEmulator);

package/lib/frameworks/index.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareFrameworks = exports.shortSiteName = void 0;
+const path_1 = require("path");
+const process_1 = require("process");
+const projectUtils_1 = require("../projectUtils");
+const normalizedHostingConfigs_1 = require("../hosting/normalizedHostingConfigs");
+const api_1 = require("../hosting/api");
+const apps_1 = require("../management/apps");
+const fs_1 = require("fs");
+const prompt_1 = require("../prompt");
+const { writeFile } = fs_1.promises;
+const shortSiteName = (site) => (site === null || site === void 0 ? void 0 : site.name) && site.name.split("/").pop();
+exports.shortSiteName = shortSiteName;
+const prepareFrameworks = async (targetNames, context, options) => {
+    const project = (0, projectUtils_1.needProjectId)(context);
+    const configs = (0, normalizedHostingConfigs_1.normalizedHostingConfigs)(Object.assign({ site: project }, options), { resolveTargets: true });
+    options.normalizedHostingConfigs = configs;
+    if (configs.length === 0)
+        return;
+    for (const config of configs) {
+        const { source, site, public: publicDir } = config;
+        if (!source)
+            continue;
+        const dist = (0, path_1.join)(".firebase", site);
+        const hostingDist = (0, path_1.join)(dist, "hosting");
+        const functionsDist = (0, path_1.join)(dist, "functions");
+        if (publicDir)
+            throw new Error(`hosting.public and hosting.source cannot both be set in firebase.json`);
+        const getProjectPath = (...args) => (0, path_1.join)(process.cwd(), source, ...args);
+        const functionName = `ssr${site.replace(/-/g, "")}`;
+        const { build } = require("firebase-frameworks/tools");
+        const { usingCloudFunctions, rewrites, redirects, headers, usesFirebaseConfig } = await build({
+            dist,
+            project,
+            site,
+            function: {
+                name: functionName,
+                region: "us-central1",
+            },
+        }, getProjectPath);
+        config.public = hostingDist;
+        if (usingCloudFunctions) {
+            if (context.hostingChannel) {
+                const message = "Cannot preview changes to the backend, you will only see changes to the static content on this channel.";
+                if (!options.nonInteractive) {
+                    const continueDeploy = await (0, prompt_1.promptOnce)({
+                        type: "confirm",
+                        default: true,
+                        message: `${message} Would you like to continue with the deploy?`,
+                    });
+                    if (!continueDeploy)
+                        (0, process_1.exit)(1);
+                }
+                else {
+                    console.error(message);
+                }
+            }
+            else {
+                const functionConfig = {
+                    source: functionsDist,
+                    codebase: `firebase-frameworks-${site}`,
+                };
+                if (targetNames.includes("functions")) {
+                    const combinedFunctionsConfig = [functionConfig].concat(options.config.get("functions") || []);
+                    options.config.set("functions", combinedFunctionsConfig);
+                }
+                else {
+                    targetNames.unshift("functions");
+                    options.config.set("functions", functionConfig);
+                }
+            }
+            config.rewrites = [
+                ...(config.rewrites || []),
+                ...rewrites,
+                {
+                    source: "**",
+                    function: functionName,
+                },
+            ];
+            let firebaseProjectConfig = null;
+            if (usesFirebaseConfig) {
+                const sites = await (0, api_1.listSites)(project);
+                const selectedSite = sites.find((it) => (0, exports.shortSiteName)(it) === site);
+                if (selectedSite) {
+                    const { appId } = selectedSite;
+                    if (appId) {
+                        firebaseProjectConfig = await (0, apps_1.getAppConfig)(appId, apps_1.AppPlatform.WEB);
+                    }
+                    else {
+                        console.warn(`No Firebase app associated with site ${site}, unable to provide authenticated server context.
+You can link a Web app to a Hosting site here https://console.firebase.google.com/project/_/settings/general/web`);
+                        if (!options.nonInteractive) {
+                            const continueDeploy = await (0, prompt_1.promptOnce)({
+                                type: "confirm",
+                                default: true,
+                                message: "Would you like to continue with the deploy?",
+                            });
+                            if (!continueDeploy)
+                                (0, process_1.exit)(1);
+                        }
+                    }
+                }
+            }
+            writeFile((0, path_1.join)(functionsDist, ".env"), `FRAMEWORKS_FIREBASE_PROJECT_CONFIG="${JSON.stringify(firebaseProjectConfig).replace(/"/g, '\\"')}"`);
+        }
+        else {
+            config.rewrites = [
+                ...(config.rewrites || []),
+                ...rewrites,
+                {
+                    source: "**",
+                    destination: "/index.html",
+                },
+            ];
+        }
+        config.redirects = [...(config.redirects || []), ...redirects];
+        config.headers = [...(config.headers || []), ...headers];
+    }
+};
+exports.prepareFrameworks = prepareFrameworks;

package/lib/functions/functionslog.js

@@ -2,18 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logEntries = exports.getApiFilter = void 0;
 const logger_1 = require("../logger");
-const previews_1 = require("../previews");
 function getApiFilter(functionList) {
-    const baseFilter = previews_1.previews.functionsv2
-        ? 'resource.type="cloud_function" OR ' +
-            '(resource.type="cloud_run_revision" AND ' +
-            'labels."goog-managed-by"="cloudfunctions")'
-        : 'resource.type="cloud_function"';
+    const baseFilter = 'resource.type="cloud_function" OR ' +
+        '(resource.type="cloud_run_revision" AND ' +
+        'labels."goog-managed-by"="cloudfunctions")';
     if (functionList) {
         const apiFuncFilters = functionList.split(",").map((fn) => {
-            return previews_1.previews.functionsv2
-                ? `resource.labels.function_name="${fn}" ` + `OR resource.labels.service_name="${fn}"`
-                : `resource.labels.function_name="${fn}"`;
+            return `resource.labels.function_name="${fn}" ` + `OR resource.labels.service_name="${fn}"`;
         });
         return baseFilter + `\n(${apiFuncFilters.join(" OR ")})`;
     }

package/lib/gcp/cloudfunctionsv2.js

@@ -183,14 +183,8 @@ function functionFromEndpoint(endpoint, source) {
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
     proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "secretEnvironmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
-    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => {
-        if (mb > 1024) {
-            return `${mb / 1024}Gi`;
-        }
-        else {
-            return `${mb}Mi`;
-        }
-    });
+    const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
+    gcfFunction.serviceConfig.availableMemory = mem > 1024 ? `${mem / 1024}Gi` : `${mem}Mi`;
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "maxInstanceCount", "maxInstances");
     if (endpoint.vpc) {

package/lib/hosting/normalizedHostingConfigs.js

@@ -57,6 +57,9 @@ function filterExcept(configs, exceptOption) {
     return filteredConfigs;
 }
 function normalizedHostingConfigs(cmdOptions, options = {}) {
+    const normalizedHostingConfigs = cmdOptions.normalizedHostingConfigs;
+    if (normalizedHostingConfigs)
+        return normalizedHostingConfigs;
     let configs = (0, lodash_1.cloneDeep)(cmdOptions.config.get("hosting"));
     if (!configs) {
         return [];

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/serve/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
 const _ = require("lodash");
 const logger_1 = require("../logger");
+const frameworks_1 = require("../frameworks");
 const previews_1 = require("../previews");
 const { FunctionsServer } = require("./functions");
 const TARGETS = {
@@ -15,7 +16,7 @@ async function serve(options) {
     if (previews_1.previews.frameworkawareness &&
         targetNames.includes("hosting") &&
         [].concat(options.config.get("hosting")).some((it) => it.source)) {
-        await require("firebase-frameworks").prepare(targetNames, { project: options.projectId }, options);
+        await (0, frameworks_1.prepareFrameworks)(targetNames, options, options);
     }
     await Promise.all(_.map(targetNames, (targetName) => {
         return TARGETS[targetName].start(options);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.8.0",
+  "version": "10.9.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.8.0",
+      "version": "10.9.2",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",
@@ -30,7 +30,7 @@
         "exit-code": "^1.0.2",
         "express": "^4.16.4",
         "filesize": "^6.1.0",
-        "firebase-frameworks": "^0.3.0",
+        "firebase-frameworks": "^0.4.2",
         "fs-extra": "^5.0.0",
         "glob": "^7.1.2",
         "google-auth-library": "^7.11.0",
@@ -6059,18 +6059,67 @@
       }
     },
     "node_modules/firebase-frameworks": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/firebase-frameworks/-/firebase-frameworks-0.3.0.tgz",
-      "integrity": "sha512-Zxtx5WsD8ZZdItIeDjjpM+JgaIWDdwBujmLYLKf2Ou6onyRsd8bNRrnVsqrnq4S3FN9TcNYliXdwMu7AwYdW7Q==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/firebase-frameworks/-/firebase-frameworks-0.4.2.tgz",
+      "integrity": "sha512-a3xNE3wPh8JWq2WOgWlSypVS9O/y/3/3Im9EV7bNBF44wFV2oOAyFdVgDk6it81+lBRv7ci8PttgQZohtsFeVA==",
       "dependencies": {
+        "fs-extra": "^10.1.0",
+        "jsonc-parser": "^3.0.0",
+        "semver": "^7.3.7",
         "tslib": "^2.3.1"
       }
     },
+    "node_modules/firebase-frameworks/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/firebase-frameworks/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/firebase-frameworks/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/firebase-frameworks/node_modules/tslib": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
       "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
+    "node_modules/firebase-frameworks/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/firebase-functions": {
       "version": "3.18.1",
       "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.18.1.tgz",
@@ -7945,6 +7994,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
+    },
     "node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -18400,17 +18454,52 @@
       }
     },
     "firebase-frameworks": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/firebase-frameworks/-/firebase-frameworks-0.3.0.tgz",
-      "integrity": "sha512-Zxtx5WsD8ZZdItIeDjjpM+JgaIWDdwBujmLYLKf2Ou6onyRsd8bNRrnVsqrnq4S3FN9TcNYliXdwMu7AwYdW7Q==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/firebase-frameworks/-/firebase-frameworks-0.4.2.tgz",
+      "integrity": "sha512-a3xNE3wPh8JWq2WOgWlSypVS9O/y/3/3Im9EV7bNBF44wFV2oOAyFdVgDk6it81+lBRv7ci8PttgQZohtsFeVA==",
       "requires": {
+        "fs-extra": "^10.1.0",
+        "jsonc-parser": "^3.0.0",
+        "semver": "^7.3.7",
         "tslib": "^2.3.1"
       },
       "dependencies": {
+        "fs-extra": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
         "tslib": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
           "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
         }
       }
     },
@@ -19883,6 +19972,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "jsonc-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
+    },
     "jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "10.8.0",
+  "version": "10.9.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -107,7 +107,7 @@
     "exit-code": "^1.0.2",
     "express": "^4.16.4",
     "filesize": "^6.1.0",
-    "firebase-frameworks": "^0.3.0",
+    "firebase-frameworks": "^0.4.2",
     "fs-extra": "^5.0.0",
     "glob": "^7.1.2",
     "google-auth-library": "^7.11.0",

package/schema/firebase-config.json

@@ -910,6 +910,9 @@
                         "site": {
                             "type": "string"
                         },
+                        "source": {
+                            "type": "string"
+                        },
                         "target": {
                             "type": "string"
                         },
@@ -1392,6 +1395,9 @@
                                     "site": {
                                         "type": "string"
                                     },
+                                    "source": {
+                                        "type": "string"
+                                    },
                                     "target": {
                                         "type": "string"
                                     },
@@ -1874,6 +1880,9 @@
                                     "site": {
                                         "type": "string"
                                     },
+                                    "source": {
+                                        "type": "string"
+                                    },
                                     "target": {
                                         "type": "string"
                                     },

package/templates/extensions/javascript/package.lint.json

@@ -3,15 +3,15 @@
   "description": "Greet the world",
   "main": "index.js",
   "dependencies": {
-    "firebase-admin": "^9.8.0",
-    "firebase-functions": "^3.14.1"
+    "firebase-admin": "^10.2.0",
+    "firebase-functions": "^3.21.0"
   },
   "devDependencies": {
-    "eslint": "^4.13.1",
-    "eslint-plugin-promise": "^3.6.0"
+    "eslint": "^8.15.1",
+    "eslint-plugin-promise": "^6.0.0"
   },
   "scripts": {
     "lint": "./node_modules/.bin/eslint --max-warnings=0 .."
   },
   "private": true
-}
+}

package/templates/extensions/javascript/package.nolint.json

@@ -3,8 +3,8 @@
   "description": "Greet the world",
   "main": "index.js",
   "dependencies": {
-    "firebase-admin": "^9.8.0",
-    "firebase-functions": "^3.14.1"
+    "firebase-admin": "^10.2.0",
+    "firebase-functions": "^3.21.0"
   },
   "private": true
-}
+}

package/templates/extensions/typescript/package.lint.json

@@ -7,13 +7,13 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "firebase-admin": "^9.8.0",
-    "firebase-functions": "^3.14.1"
+    "firebase-admin": "^10.2.0",
+    "firebase-functions": "^3.21.0"
   },
   "devDependencies": {
-    "eslint": "^7.6.0",
-    "eslint-plugin-import": "^2.22.0",
-    "typescript": "^3.8.0"
+    "eslint": "^8.15.1",
+    "eslint-plugin-import": "^2.26.0",
+    "typescript": "^4.6.4"
   },
   "private": true
-}
+}

package/templates/init/functions/typescript/package.nolint.json

@@ -14,12 +14,11 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "firebase-admin": "^10.0.2",
-    "firebase-functions": "^3.18.0"
+    "firebase-admin": "^10.2.0",
+    "firebase-functions": "^3.21.0"
   },
   "devDependencies": {
-    "typescript": "^4.5.4",
-    "firebase-functions-test": "^0.2.0"
+    "typescript": "^4.6.4"
   },
   "private": true
-}
+}