firebase-tools 10.2.0 → 10.2.1

package/lib/apiv2.js

@@ -259,6 +259,9 @@ class Client {
                             }
                         }
                     }
+                    else if (options.responseType === "xml") {
+                        body = (await res.text());
+                    }
                     else if (options.responseType === "stream") {
                         body = res.body;
                     }

package/lib/commands/auth-import.js

@@ -93,7 +93,7 @@ module.exports = new command_1.Command("auth:import [dataFile]")
                     if (err) {
                         throw new error_1.FirebaseError(`Validation Error: ${err}`);
                     }
-                    currentBatch.push(user);
+                    currentBatch.push(value);
                     if (currentBatch.length === MAX_BATCH_SIZE) {
                         batches.push(currentBatch);
                         currentBatch = [];

package/lib/commands/functions-config-clone.js

@@ -38,7 +38,7 @@ exports.default = new command_1.Command("functions:config:clone")
     else if (options.only && options.except) {
         throw new error_1.FirebaseError("Cannot use both --only and --except at the same time.");
     }
-    let only = [];
+    let only;
     let except = [];
     if (options.only) {
         only = options.only.split(",");

package/lib/deploy/hosting/client.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.client = void 0;
+const api_1 = require("../../api");
+const apiv2_1 = require("../../apiv2");
+exports.client = new apiv2_1.Client({
+    urlPrefix: api_1.hostingApiOrigin,
+    apiVersion: "v1beta1",
+});

package/lib/deploy/hosting/convertConfig.js

@@ -46,6 +46,12 @@ function convertConfig(config) {
             }
             else if ("function" in rewrite) {
                 vRewrite.function = rewrite.function;
+                if (rewrite.region) {
+                    vRewrite.functionRegion = rewrite.region;
+                }
+                else {
+                    vRewrite.functionRegion = "us-central1";
+                }
             }
             else if ("dynamicLinks" in rewrite) {
                 vRewrite.dynamicLinks = rewrite.dynamicLinks;

package/lib/deploy/hosting/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.release = exports.deploy = exports.prepare = void 0;
-const prepare = require("./prepare");
-exports.prepare = prepare;
-const deploy_1 = require("./deploy");
+var prepare_1 = require("./prepare");
+Object.defineProperty(exports, "prepare", { enumerable: true, get: function () { return prepare_1.prepare; } });
+var deploy_1 = require("./deploy");
 Object.defineProperty(exports, "deploy", { enumerable: true, get: function () { return deploy_1.deploy; } });
-const release = require("./release");
-exports.release = release;
+var release_1 = require("./release");
+Object.defineProperty(exports, "release", { enumerable: true, get: function () { return release_1.release; } });

package/lib/deploy/hosting/prepare.js

@@ -1,44 +1,44 @@
 "use strict";
-const _ = require("lodash");
-const api = require("../../api");
-const { convertConfig } = require("./convertConfig");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepare = void 0;
+const error_1 = require("../../error");
+const client_1 = require("./client");
+const projectUtils_1 = require("../../projectUtils");
+const normalizedHostingConfigs_1 = require("../../hosting/normalizedHostingConfigs");
+const validate_1 = require("./validate");
+const convertConfig_1 = require("./convertConfig");
 const deploymentTool = require("../../deploymentTool");
-const { FirebaseError } = require("../../error");
-const { normalizedHostingConfigs } = require("../../hosting/normalizedHostingConfigs");
-const { validateDeploy } = require("./validate");
-module.exports = function (context, options) {
+async function prepare(context, options) {
     if (options.public) {
-        if (_.isArray(options.config.get("hosting"))) {
-            throw new FirebaseError("Cannot specify --public option with multi-site configuration.");
+        if (Array.isArray(options.config.get("hosting"))) {
+            throw new error_1.FirebaseError("Cannot specify --public option with multi-site configuration.");
         }
         options.config.set("hosting.public", options.public);
     }
-    const configs = normalizedHostingConfigs(options, { resolveTargets: true });
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const configs = (0, normalizedHostingConfigs_1.normalizedHostingConfigs)(options, { resolveTargets: true });
     if (configs.length === 0) {
         return Promise.resolve();
     }
     context.hosting = {
-        deploys: configs.map(function (cfg) {
+        deploys: configs.map((cfg) => {
             return { config: cfg, site: cfg.site };
         }),
     };
     const versionCreates = [];
-    _.each(context.hosting.deploys, function (deploy) {
+    for (const deploy of context.hosting.deploys) {
         const cfg = deploy.config;
-        validateDeploy(deploy, options);
+        (0, validate_1.validateDeploy)(deploy, options);
         const data = {
-            config: convertConfig(cfg),
+            config: (0, convertConfig_1.convertConfig)(cfg),
             labels: deploymentTool.labels(),
         };
-        versionCreates.push(api
-            .request("POST", `/v1beta1/sites/${deploy.site}/versions`, {
-            origin: api.hostingApiOrigin,
-            auth: true,
-            data,
-        })
-            .then(function (result) {
-            deploy.version = result.body.name;
+        versionCreates.push(client_1.client
+            .post(`/projects/${projectNumber}/sites/${deploy.site}/versions`, data)
+            .then((res) => {
+            deploy.version = res.body.name;
         }));
-    });
-    return Promise.all(versionCreates);
-};
+    }
+    await Promise.all(versionCreates);
+}
+exports.prepare = prepare;

package/lib/deploy/hosting/release.js

@@ -1,34 +1,31 @@
 "use strict";
-const api = require("../../api");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.release = void 0;
+const client_1 = require("./client");
+const logger_1 = require("../../logger");
+const projectUtils_1 = require("../../projectUtils");
 const utils = require("../../utils");
-const { logger } = require("../../logger");
-module.exports = function (context, options) {
+async function release(context, options) {
     if (!context.hosting || !context.hosting.deploys) {
-        return Promise.resolve();
+        return;
     }
-    logger.debug(JSON.stringify(context.hosting.deploys, null, 2));
-    return Promise.all(context.hosting.deploys.map(async function (deploy) {
-        utils.logLabeledBullet("hosting[" + deploy.site + "]", "finalizing version...");
-        const finalizeResult = await api.request("PATCH", `/v1beta1/${deploy.version}?updateMask=status`, {
-            origin: api.hostingApiOrigin,
-            auth: true,
-            data: { status: "FINALIZED" },
-        });
-        logger.debug("[hosting] finalized version for " + deploy.site + ":", finalizeResult.body);
-        utils.logLabeledSuccess("hosting[" + deploy.site + "]", "version finalized");
-        utils.logLabeledBullet("hosting[" + deploy.site + "]", "releasing new version...");
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    logger_1.logger.debug(JSON.stringify(context.hosting.deploys, null, 2));
+    await Promise.all(context.hosting.deploys.map(async (deploy) => {
+        utils.logLabeledBullet(`hosting[${deploy.site}]`, "finalizing version...");
+        const finalizeResult = await client_1.client.patch(`/${deploy.version}`, { status: "FINALIZED" }, { queryParams: { updateMask: "status" } });
+        logger_1.logger.debug(`[hosting] finalized version for ${deploy.site}:${finalizeResult.body}`);
+        utils.logLabeledSuccess(`hosting[${deploy.site}]`, "version finalized");
+        utils.logLabeledBullet(`hosting[${deploy.site}]`, "releasing new version...");
         const channelSegment = context.hostingChannel && context.hostingChannel !== "live"
             ? `/channels/${context.hostingChannel}`
             : "";
         if (channelSegment) {
-            logger.debug("[hosting] releasing to channel:", context.hostingChannel);
+            logger_1.logger.debug("[hosting] releasing to channel:", context.hostingChannel);
         }
-        const releaseResult = await api.request("POST", `/v1beta1/sites/${deploy.site}${channelSegment}/releases?version_name=${deploy.version}`, {
-            auth: true,
-            origin: api.hostingApiOrigin,
-            data: { message: options.message || null },
-        });
-        logger.debug("[hosting] release:", releaseResult.body);
-        utils.logLabeledSuccess("hosting[" + deploy.site + "]", "release complete");
+        const releaseResult = await client_1.client.post(`/projects/${projectNumber}/sites/${deploy.site}${channelSegment}/releases`, { message: options.message || null }, { queryParams: { versionName: deploy.version } });
+        logger_1.logger.debug("[hosting] release:", releaseResult.body);
+        utils.logLabeledSuccess(`hosting[${deploy.site}]`, "release complete");
     }));
-};
+}
+exports.release = release;

package/lib/emulator/commandUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emulatorExec = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
+exports.emulatorExec = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
 const clc = require("cli-color");
 const childProcess = require("child_process");
 const controller = require("../emulator/controller");
@@ -36,6 +36,7 @@ exports.DESC_EXPORT_ON_EXIT = "automatically export emulator data (emulators:exp
     `when no dir is provided the location of ${exports.FLAG_IMPORT} is used`;
 exports.EXPORT_ON_EXIT_USAGE_ERROR = `"${exports.FLAG_EXPORT_ON_EXIT_NAME}" must be used with "${exports.FLAG_IMPORT}"` +
     ` or provide a dir directly to "${exports.FLAG_EXPORT_ON_EXIT}"`;
+exports.EXPORT_ON_EXIT_CWD_DANGER = `"${exports.FLAG_EXPORT_ON_EXIT_NAME}" must not point to the current directory or parents. Please choose a new/dedicated directory for exports.`;
 exports.FLAG_UI = "--ui";
 exports.DESC_UI = "run the Emulator UI";
 exports.FLAG_TEST_CONFIG = "--test-config <firebase.json file>";
@@ -131,6 +132,9 @@ function setExportOnExitOptions(options) {
         if (options.exportOnExit === true || !options.exportOnExit) {
             throw new error_1.FirebaseError(exports.EXPORT_ON_EXIT_USAGE_ERROR);
         }
+        if (path.resolve(".").startsWith(path.resolve(options.exportOnExit))) {
+            throw new error_1.FirebaseError(exports.EXPORT_ON_EXIT_CWD_DANGER);
+        }
     }
     return;
 }

package/lib/emulator/downloadableEmulators.js

@@ -13,6 +13,7 @@ const path = require("path");
 const os = require("os");
 const registry_1 = require("./registry");
 const download_1 = require("../emulator/download");
+const previews_1 = require("../previews");
 const EMULATOR_INSTANCE_KILL_TIMEOUT = 4000;
 const CACHE_DIR = process.env.FIREBASE_EMULATORS_PATH || path.join(os.homedir(), ".cache", "firebase", "emulators");
 exports.DownloadDetails = {
@@ -49,19 +50,35 @@ exports.DownloadDetails = {
             namePrefix: "cloud-storage-rules-emulator",
         },
     },
-    ui: {
-        version: "1.6.4",
-        downloadPath: path.join(CACHE_DIR, "ui-v1.6.4.zip"),
-        unzipDir: path.join(CACHE_DIR, "ui-v1.6.4"),
-        binaryPath: path.join(CACHE_DIR, "ui-v1.6.4", "server.bundle.js"),
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.6.4.zip",
-            expectedSize: 3757300,
-            expectedChecksum: "20d4ee71e4ff7527b1843b6a8636142e",
-            namePrefix: "ui",
+    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.5",
+            downloadPath: path.join(CACHE_DIR, "ui-v1.6.5.zip"),
+            unzipDir: path.join(CACHE_DIR, "ui-v1.6.5"),
+            binaryPath: path.join(CACHE_DIR, "ui-v1.6.5", "server.bundle.js"),
+            opts: {
+                cacheDir: CACHE_DIR,
+                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.6.5.zip",
+                expectedSize: 3816994,
+                expectedChecksum: "92dfff4b2ef8ab616e8a60cc93e0a00b",
+                namePrefix: "ui",
+            },
         },
-    },
     pubsub: {
         downloadPath: path.join(CACHE_DIR, "pubsub-emulator-0.1.0.zip"),
         version: "0.1.0",

package/lib/emulator/functionsEmulator.js

@@ -243,6 +243,7 @@ class FunctionsEmulator {
             triggerDefinitions = (0, functionsEmulatorShared_1.emulatedFunctionsByRegion)(emulatableBackend.predefinedTriggers);
         }
         else {
+            const runtimeConfig = this.getRuntimeConfig(emulatableBackend);
             const runtimeDelegate = await (0, runtimes_1.getRuntimeDelegate)({
                 projectId: this.args.projectId,
                 projectDir: this.args.projectDir,
@@ -253,7 +254,7 @@ class FunctionsEmulator {
             logger_1.logger.debug(`Building ${runtimeDelegate.name} source`);
             await runtimeDelegate.build();
             logger_1.logger.debug(`Analyzing ${runtimeDelegate.name} backend spec`);
-            const discoveredBackend = await runtimeDelegate.discoverSpec({}, Object.assign(Object.assign(Object.assign(Object.assign({}, this.getSystemEnvs()), this.getEmulatorEnvs()), { FIREBASE_CONFIG: this.getFirebaseConfig() }), emulatableBackend.env));
+            const discoveredBackend = await runtimeDelegate.discoverSpec(runtimeConfig, Object.assign(Object.assign(Object.assign(Object.assign({}, this.getSystemEnvs()), this.getEmulatorEnvs()), { FIREBASE_CONFIG: this.getFirebaseConfig() }), emulatableBackend.env));
             const endpoints = backend.allEndpoints(discoveredBackend);
             triggerDefinitions = (0, functionsEmulatorShared_1.emulatedFunctionsFromEndpoints)(endpoints);
         }
@@ -521,6 +522,16 @@ class FunctionsEmulator {
         }
         return process.execPath;
     }
+    getRuntimeConfig(backend) {
+        const configPath = `${backend.functionsDir}/.runtimeconfig.json`;
+        try {
+            const configContent = fs.readFileSync(configPath, "utf8");
+            return JSON.parse(configContent.toString());
+        }
+        catch (e) {
+        }
+        return {};
+    }
     getUserEnvs(backend) {
         const projectInfo = {
             functionsSource: backend.functionsDir,
@@ -543,11 +554,10 @@ class FunctionsEmulator {
         envs.K_REVISION = "1";
         envs.PORT = "80";
         if (trigger) {
-            const service = trigger.name;
-            const target = service.replace(/-/g, ".");
+            const target = trigger.entryPoint;
             envs.FUNCTION_TARGET = target;
             envs.FUNCTION_SIGNATURE_TYPE = (0, functionsEmulatorShared_1.getSignatureType)(trigger);
-            envs.K_SERVICE = service;
+            envs.K_SERVICE = trigger.name;
         }
         return envs;
     }

package/lib/extensions/listExtensions.js

@@ -8,6 +8,7 @@ const extensionsApi_1 = require("./extensionsApi");
 const extensionsHelper_1 = require("./extensionsHelper");
 const utils = require("../utils");
 const extensionsUtils = require("./utils");
+const logger_1 = require("../logger");
 async function listExtensions(projectId) {
     const instances = await (0, extensionsApi_1.listInstances)(projectId);
     if (instances.length < 1) {
@@ -47,6 +48,7 @@ async function listExtensions(projectId) {
         });
     });
     utils.logLabeledBullet(extensionsHelper_1.logPrefix, `list of extensions installed in ${clc.bold(projectId)}:`);
+    logger_1.logger.info(table.toString());
     return formatted;
 }
 exports.listExtensions = listExtensions;

package/lib/gcp/storage.js

@@ -29,6 +29,7 @@ async function upload(source, uploadUrl, extraHeaders) {
         method: "PUT",
         path: url.pathname,
         queryParams: url.searchParams,
+        responseType: "xml",
         headers: Object.assign({ "content-type": "application/zip" }, extraHeaders),
         body: source.stream,
         skipLog: { resBody: true },

package/lib/hosting/functionsProxy.js

@@ -1,26 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.functionsProxy = void 0;
 const lodash_1 = require("lodash");
 const proxy_1 = require("./proxy");
 const projectUtils_1 = require("../projectUtils");
 const registry_1 = require("../emulator/registry");
 const types_1 = require("../emulator/types");
 const functionsEmulator_1 = require("../emulator/functionsEmulator");
-function default_1(options) {
+const error_1 = require("../error");
+function functionsProxy(options) {
     return (rewrite) => {
         return new Promise((resolve) => {
             const projectId = (0, projectUtils_1.needProjectId)(options);
-            let url = `https://us-central1-${projectId}.cloudfunctions.net/${rewrite.function}`;
+            if (!("function" in rewrite)) {
+                throw new error_1.FirebaseError(`A non-function rewrite cannot be used in functionsProxy`, {
+                    exit: 2,
+                });
+            }
+            if (!rewrite.region) {
+                rewrite.region = "us-central1";
+            }
+            let url = `https://${rewrite.region}-${projectId}.cloudfunctions.net/${rewrite.function}`;
             let destLabel = "live";
             if ((0, lodash_1.includes)(options.targets, "functions")) {
                 destLabel = "local";
                 const functionsEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
                 if (functionsEmu) {
-                    url = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(functionsEmu.getInfo().host, functionsEmu.getInfo().port, projectId, rewrite.function, "us-central1");
+                    url = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(functionsEmu.getInfo().host, functionsEmu.getInfo().port, projectId, rewrite.function, rewrite.region);
                 }
             }
-            resolve((0, proxy_1.proxyRequestHandler)(url, `${destLabel} Function ${rewrite.function}`));
+            resolve((0, proxy_1.proxyRequestHandler)(url, `${destLabel} Function ${rewrite.region}/${rewrite.function}`));
         });
     };
 }
-exports.default = default_1;
+exports.functionsProxy = functionsProxy;

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, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: 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/responseToError.js

@@ -2,16 +2,25 @@
 const _ = require("lodash");
 const { FirebaseError } = require("./error");
 module.exports = function (response, body) {
-    if (typeof body === "string" && response.statusCode === 404) {
-        body = {
-            error: {
-                message: "Not Found",
-            },
-        };
-    }
     if (response.statusCode < 400) {
         return null;
     }
+    if (typeof body === "string") {
+        if (response.statusCode === 404) {
+            body = {
+                error: {
+                    message: "Not Found",
+                },
+            };
+        }
+        else {
+            body = {
+                error: {
+                    message: body,
+                },
+            };
+        }
+    }
     if (typeof body !== "object") {
         try {
             body = JSON.parse(body);

package/lib/serve/hosting.js

@@ -46,7 +46,7 @@ function startServer(options, config, port, init) {
             },
         },
         rewriters: {
-            function: (0, functionsProxy_1.default)(options),
+            function: (0, functionsProxy_1.functionsProxy)(options),
             run: (0, cloudRunProxy_1.default)(options),
         },
     }).listen(() => {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.2.0",
+      "version": "10.2.1",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",
@@ -43,7 +43,7 @@
         "mime": "^2.5.2",
         "minimatch": "^3.0.4",
         "morgan": "^1.10.0",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.7",
         "open": "^6.3.0",
         "ora": "^5.4.1",
         "portfinder": "^1.0.23",
@@ -99,7 +99,7 @@
         "@types/mocha": "^9.0.0",
         "@types/multer": "^1.4.3",
         "@types/node": "^12.20.39",
-        "@types/node-fetch": "^2.5.7",
+        "@types/node-fetch": "^2.5.12",
         "@types/progress": "^2.0.3",
         "@types/puppeteer": "^5.4.2",
         "@types/request": "^2.48.1",
@@ -835,6 +835,15 @@
         "tslib": "^1.11.1"
       }
     },
+    "node_modules/@firebase/firestore/node_modules/node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true,
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
     "node_modules/@firebase/functions": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.5.1.tgz",
@@ -877,6 +886,15 @@
         "tslib": "^1.11.1"
       }
     },
+    "node_modules/@firebase/functions/node_modules/node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true,
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
     "node_modules/@firebase/installations": {
       "version": "0.4.17",
       "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.17.tgz",
@@ -2120,9 +2138,9 @@
       "integrity": "sha512-U7PMwkDmc3bnL0e4U8oA0POpi1vfsYDc+DEUS2+rPxm9NlLcW1dBa5JcRhO633PoPUcCSWMNXrMsqhmAVEo+IQ=="
     },
     "node_modules/@types/node-fetch": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
-      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "version": "2.5.12",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+      "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -6780,11 +6798,11 @@
       }
     },
     "node_modules/google-p12-pem": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz",
-      "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.3.tgz",
+      "integrity": "sha512-MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ==",
       "dependencies": {
-        "node-forge": "^0.10.0"
+        "node-forge": "^1.0.0"
       },
       "bin": {
         "gp12-pem": "build/src/bin/gp12-pem.js"
@@ -6793,6 +6811,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/google-p12-pem/node_modules/node-forge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
+      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
     "node_modules/got": {
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
@@ -9164,11 +9190,22 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
       "engines": {
         "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
     "node_modules/node-fetch-h2": {
@@ -9187,6 +9224,7 @@
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
       "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+      "dev": true,
       "engines": {
         "node": ">= 6.0.0"
       }
@@ -12379,6 +12417,11 @@
         "lodash": "^4.17.10"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
     "node_modules/traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
@@ -13062,6 +13105,11 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
     "node_modules/websocket-driver": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
@@ -13091,6 +13139,15 @@
       "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==",
       "dev": true
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -14048,6 +14105,12 @@
           "requires": {
             "tslib": "^1.11.1"
           }
+        },
+        "node-fetch": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+          "dev": true
         }
       }
     },
@@ -14089,6 +14152,12 @@
           "requires": {
             "tslib": "^1.11.1"
           }
+        },
+        "node-fetch": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+          "dev": true
         }
       }
     },
@@ -15189,9 +15258,9 @@
       "integrity": "sha512-U7PMwkDmc3bnL0e4U8oA0POpi1vfsYDc+DEUS2+rPxm9NlLcW1dBa5JcRhO633PoPUcCSWMNXrMsqhmAVEo+IQ=="
     },
     "@types/node-fetch": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
-      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "version": "2.5.12",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+      "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -18861,11 +18930,18 @@
       }
     },
     "google-p12-pem": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz",
-      "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.3.tgz",
+      "integrity": "sha512-MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ==",
       "requires": {
-        "node-forge": "^0.10.0"
+        "node-forge": "^1.0.0"
+      },
+      "dependencies": {
+        "node-forge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
+          "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w=="
+        }
       }
     },
     "got": {
@@ -20757,9 +20833,12 @@
       }
     },
     "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
     },
     "node-fetch-h2": {
       "version": "2.3.0",
@@ -20773,7 +20852,8 @@
     "node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+      "dev": true
     },
     "node-gyp": {
       "version": "8.4.1",
@@ -23281,6 +23361,11 @@
         "lodash": "^4.17.10"
       }
     },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
     "traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
@@ -23783,6 +23868,11 @@
         "defaults": "^1.0.3"
       }
     },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
     "websocket-driver": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
@@ -23806,6 +23896,15 @@
       "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==",
       "dev": true
     },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -119,7 +119,7 @@
     "mime": "^2.5.2",
     "minimatch": "^3.0.4",
     "morgan": "^1.10.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.7",
     "open": "^6.3.0",
     "ora": "^5.4.1",
     "portfinder": "^1.0.23",
@@ -172,7 +172,7 @@
     "@types/mocha": "^9.0.0",
     "@types/multer": "^1.4.3",
     "@types/node": "^12.20.39",
-    "@types/node-fetch": "^2.5.7",
+    "@types/node-fetch": "^2.5.12",
     "@types/progress": "^2.0.3",
     "@types/puppeteer": "^5.4.2",
     "@types/request": "^2.48.1",

package/schema/firebase-config.json

@@ -622,6 +622,9 @@
                                             },
                                             "glob": {
                                                 "type": "string"
+                                            },
+                                            "region": {
+                                                "type": "string"
                                             }
                                         },
                                         "required": [
@@ -696,6 +699,9 @@
                                             "function": {
                                                 "type": "string"
                                             },
+                                            "region": {
+                                                "type": "string"
+                                            },
                                             "source": {
                                                 "type": "string"
                                             }
@@ -774,6 +780,9 @@
                                             },
                                             "regex": {
                                                 "type": "string"
+                                            },
+                                            "region": {
+                                                "type": "string"
                                             }
                                         },
                                         "required": [
@@ -1095,6 +1104,9 @@
                                                         },
                                                         "glob": {
                                                             "type": "string"
+                                                        },
+                                                        "region": {
+                                                            "type": "string"
                                                         }
                                                     },
                                                     "required": [
@@ -1169,6 +1181,9 @@
                                                         "function": {
                                                             "type": "string"
                                                         },
+                                                        "region": {
+                                                            "type": "string"
+                                                        },
                                                         "source": {
                                                             "type": "string"
                                                         }
@@ -1247,6 +1262,9 @@
                                                         },
                                                         "regex": {
                                                             "type": "string"
+                                                        },
+                                                        "region": {
+                                                            "type": "string"
                                                         }
                                                     },
                                                     "required": [
@@ -1568,6 +1586,9 @@
                                                         },
                                                         "glob": {
                                                             "type": "string"
+                                                        },
+                                                        "region": {
+                                                            "type": "string"
                                                         }
                                                     },
                                                     "required": [
@@ -1642,6 +1663,9 @@
                                                         "function": {
                                                             "type": "string"
                                                         },
+                                                        "region": {
+                                                            "type": "string"
+                                                        },
                                                         "source": {
                                                             "type": "string"
                                                         }
@@ -1720,6 +1744,9 @@
                                                         },
                                                         "regex": {
                                                             "type": "string"
+                                                        },
+                                                        "region": {
+                                                            "type": "string"
                                                         }
                                                     },
                                                     "required": [