firebase-tools 10.7.2 → 10.9.1

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/cloudfunctions.js

@@ -145,7 +145,7 @@ async function setInvokerUpdate(projectId, fnName, invoker) {
 exports.setInvokerUpdate = setInvokerUpdate;
 async function updateFunction(cloudFunction) {
     const endpoint = `/${cloudFunction.name}`;
-    const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables");
+    const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables", "secretEnvironmentVariables");
     try {
         const headers = {};
         if (previews_1.previews.artifactregistry) {

package/lib/gcp/cloudfunctionsv2.js

@@ -59,9 +59,13 @@ function mebibytes(memory) {
 exports.mebibytes = mebibytes;
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
+    utils.logWarning(clc.bold.yellow("functions:") + ` ${err === null || err === void 0 ? void 0 : err.message}`);
     if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 429) {
         utils.logWarning(`${clc.bold.yellow("functions:")} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
+    else if (err === null || err === void 0 ? void 0 : err.message.includes("If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent")) {
+        utils.logWarning(`${clc.bold.yellow("functions:")} since this is your first time using functions v2, we need a little bit longer to finish setting everything up, please retry the deployment in a few minutes.`);
+    }
     else {
         utils.logWarning(clc.bold.yellow("functions:") + " failed to " + type + " function " + funcName);
     }
@@ -133,7 +137,7 @@ async function listFunctionsInternal(projectId, region) {
     }
 }
 async function updateFunction(cloudFunction) {
-    const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables");
+    const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),
@@ -178,15 +182,9 @@ function functionFromEndpoint(endpoint, source) {
         serviceConfig: {},
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
-    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
-    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => {
-        if (mb > 1024) {
-            return `${mb / 1024}Gi`;
-        }
-        else {
-            return `${mb}Mi`;
-        }
-    });
+    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "secretEnvironmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
+    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) {
@@ -295,7 +293,7 @@ function endpointFromFunction(gcfFunction) {
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
         project,
         region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, uri: gcfFunction.serviceConfig.uri });
-    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables", "timeoutSeconds");
+    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", mebibytes);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");

package/lib/gcp/serviceusage.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateServiceIdentity = void 0;
+const cli_color_1 = require("cli-color");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
+const error_1 = require("../error");
+const utils = require("../utils");
+const apiClient = new apiv2_1.Client({
+    urlPrefix: api_1.serviceUsageOrigin,
+    apiVersion: "v1beta1",
+});
+async function generateServiceIdentity(projectNumber, service, prefix) {
+    utils.logLabeledBullet(prefix, `generating the service identity for ${(0, cli_color_1.bold)(service)}...`);
+    try {
+        return await apiClient.post(`projects/${projectNumber}/services/${service}:generateServiceIdentity`);
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Error generating the service identity for ${service}.`, {
+            original: err,
+        });
+    }
+}
+exports.generateServiceIdentity = generateServiceIdentity;

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 }, 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/lib/throttler/throttler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Throttler = exports.timeToWait = void 0;
+exports.Throttler = exports.timeToWait = exports.backoff = void 0;
 const logger_1 = require("../logger");
 const retries_exhausted_error_1 = require("./errors/retries-exhausted-error");
 const timeout_error_1 = require("./errors/timeout-error");
@@ -9,6 +9,7 @@ function backoff(retryNumber, delay, maxDelay) {
         setTimeout(resolve, timeToWait(retryNumber, delay, maxDelay));
     });
 }
+exports.backoff = backoff;
 function timeToWait(retryNumber, delay, maxDelay) {
     return Math.min(delay * Math.pow(2, retryNumber), maxDelay);
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.7.2",
+  "version": "10.9.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.7.2",
+      "version": "10.9.1",
       "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.7.2",
+  "version": "10.9.1",
   "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

@@ -2,17 +2,18 @@
   "name": "functions",
   "scripts": {
     "lint": "eslint \"src/**/*\"",
-    "build": "tsc"
+    "build": "tsc",
+    "build:watch": "tsc --watch"
   },
   "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/extensions/typescript/package.nolint.json

@@ -1,7 +1,8 @@
 {
   "name": "functions",
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "build:watch": "tsc --watch"
   },
   "main": "lib/index.js",
   "dependencies": {

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

@@ -3,6 +3,7 @@
   "scripts": {
     "lint": "eslint --ext .js,.ts .",
     "build": "tsc",
+    "build:watch": "tsc --watch",
     "serve": "npm run build && firebase emulators:start --only functions",
     "shell": "npm run build && firebase functions:shell",
     "start": "npm run shell",

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

@@ -2,6 +2,7 @@
   "name": "functions",
   "scripts": {
     "build": "tsc",
+    "build:watch": "tsc --watch",
     "serve": "npm run build && firebase emulators:start --only functions",
     "shell": "npm run build && firebase functions:shell",
     "start": "npm run shell",
@@ -13,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
-}
+}