firebase-tools 12.4.3 → 12.4.5

package/lib/apiv2.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = exports.setAccessToken = exports.setRefreshToken = void 0;
 const url_1 = require("url");
 const stream_1 = require("stream");
-const ProxyAgent = require("proxy-agent");
+const proxy_agent_1 = require("proxy-agent");
 const retry = require("retry");
 const abort_controller_1 = require("abort-controller");
 const node_fetch_1 = require("node-fetch");
@@ -179,12 +179,8 @@ class Client {
             redirect: options.redirect,
             compress: options.compress,
         };
-        if (this.opts.proxy) {
-            fetchOptions.agent = new ProxyAgent(this.opts.proxy);
-        }
-        const envProxy = proxyURIFromEnv();
-        if (envProxy) {
-            fetchOptions.agent = new ProxyAgent(envProxy);
+        if (proxyURIFromEnv()) {
+            fetchOptions.agent = new proxy_agent_1.ProxyAgent();
         }
         if (options.signal) {
             fetchOptions.signal = options.signal;
@@ -233,6 +229,7 @@ class Client {
                     }
                     catch (thrown) {
                         const err = thrown instanceof Error ? thrown : new Error(thrown);
+                        logger_1.logger.debug(`*** [apiv2] error from fetch(${fetchURL}, ${JSON.stringify(fetchOptions)}): ${err}`);
                         const isAbortError = err.name.includes("AbortError");
                         if (isAbortError) {
                             throw new error_1.FirebaseError(`Timeout reached making request to ${fetchURL}`, {

package/lib/commands/database-instances-list.js

@@ -1,76 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const command_1 = require("../command");
 const Table = require("cli-table");
+const command_1 = require("../command");
 const clc = require("colorette");
 const ora = require("ora");
 const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
-const projectUtils_1 = require("../projectUtils");
-const firedata = require("../gcp/firedata");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const experiments = require("../experiments");
-const projectUtils_2 = require("../projectUtils");
+const projectUtils_1 = require("../projectUtils");
 const database_1 = require("../management/database");
-function logInstances(instances) {
-    if (instances.length === 0) {
-        logger_1.logger.info(clc.bold("No database instances found."));
-        return;
-    }
-    const tableHead = ["Database Instance Name", "Location", "Type", "State"];
-    const table = new Table({ head: tableHead, style: { head: ["green"] } });
-    instances.forEach((db) => {
-        table.push([db.name, db.location, db.type, db.state]);
-    });
-    logger_1.logger.info(table.toString());
-}
-function logInstancesCount(count = 0) {
-    if (count === 0) {
-        return;
-    }
-    logger_1.logger.info("");
-    logger_1.logger.info(`${count} database instance(s) total.`);
-}
 exports.command = new command_1.Command("database:instances:list")
     .description("list realtime database instances, optionally filtered by a specified location")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.list"])
+    .option("-l, --location <location>", "(optional) location for the database instance, defaults to all regions")
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.DATABASE)
     .action(async (options) => {
     const location = (0, database_1.parseDatabaseLocation)(options.location, database_1.DatabaseLocation.ANY);
     const spinner = ora("Preparing the list of your Firebase Realtime Database instances" +
         `${location === database_1.DatabaseLocation.ANY ? "" : ` for location: ${location}`}`).start();
-    let instances;
-    if (experiments.isEnabled("rtdbmanagement")) {
-        const projectId = (0, projectUtils_2.needProjectId)(options);
-        try {
-            instances = await (0, database_1.listDatabaseInstances)(projectId, location);
-        }
-        catch (err) {
-            spinner.fail();
-            throw err;
-        }
-        spinner.succeed();
-        logInstances(instances);
-        logInstancesCount(instances.length);
-        return instances;
-    }
-    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    let instances = [];
     try {
-        instances = await firedata.listDatabaseInstances(projectNumber);
+        instances = await (0, database_1.listDatabaseInstances)(projectId, location);
     }
     catch (err) {
         spinner.fail();
         throw err;
     }
     spinner.succeed();
-    for (const instance of instances) {
-        logger_1.logger.info(instance.instance);
+    if (instances.length === 0) {
+        logger_1.logger.info(clc.bold("No database instances found."));
+        return;
+    }
+    if (!experiments.isEnabled("rtdbmanagement")) {
+        for (const instance of instances) {
+            logger_1.logger.info(instance.name);
+        }
+        logger_1.logger.info(`Project ${options.project} has ${instances.length} database instances`);
+        return instances;
     }
-    logger_1.logger.info(`Project ${options.project} has ${instances.length} database instances`);
+    const tableHead = ["Database Instance Name", "Location", "Type", "State"];
+    const table = new Table({ head: tableHead, style: { head: ["green"] } });
+    for (const db of instances) {
+        table.push([db.name, db.location, db.type, db.state]);
+    }
+    logger_1.logger.info(table.toString());
+    logger_1.logger.info(`${instances.length} database instance(s) total.`);
     return instances;
 });
-if (experiments.isEnabled("rtdbmanagement")) {
-    exports.command = exports.command.option("-l, --location <location>", "(optional) location for the database instance, defaults to us-central1");
-}

package/lib/commands/functions-secrets-set.js

@@ -12,9 +12,9 @@ const prompt_1 = require("../prompt");
 const utils_1 = require("../utils");
 const projectUtils_1 = require("../projectUtils");
 const secretManager_1 = require("../gcp/secretManager");
+const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const secrets = require("../functions/secrets");
 const backend = require("../deploy/functions/backend");
-const ensureApiEnabled_1 = require("../ensureApiEnabled");
 exports.command = new command_1.Command("functions:secrets:set <KEY>")
     .description("Create or update a secret for use in Cloud Functions for Firebase.")
     .withForce("Automatically updates functions to use the new secret.")
@@ -58,7 +58,7 @@ exports.command = new command_1.Command("functions:secrets:set <KEY>")
         logger_1.logger.debug("Customer set secrets before enabling functions. Exiting");
         return;
     }
-    const haveBackend = await backend.existingBackend({ projectId });
+    let haveBackend = await backend.existingBackend({ projectId });
     const endpointsToUpdate = backend
         .allEndpoints(haveBackend)
         .filter((e) => secrets.inUse({ projectId, projectNumber }, secret, e));
@@ -87,4 +87,20 @@ exports.command = new command_1.Command("functions:secrets:set <KEY>")
         return updated;
     });
     await Promise.all(updateOps);
+    haveBackend = await backend.existingBackend({ projectId }, true);
+    const staleEndpoints = backend.allEndpoints(backend.matchingBackend(haveBackend, (e) => {
+        const pInfo = { projectId, projectNumber };
+        return secrets.inUse(pInfo, secret, e) && !secrets.versionInUse(pInfo, secretVersion, e);
+    }));
+    if (staleEndpoints.length !== 0) {
+        (0, utils_1.logWarning)(`${staleEndpoints.length} functions are unexpectedly using old version of secret ${secret.name} still:\n\t` +
+            staleEndpoints.map((e) => `${e.id}(${e.region})`).join("\n\t"));
+        (0, utils_1.logBullet)("Please deploy your functions manually for the change to take effect by running:\n\t" +
+            clc.bold("firebase deploy --only functions"));
+    }
+    const secretsToPrune = (await secrets.pruneSecrets({ projectId, projectNumber }, backend.allEndpoints(haveBackend))).filter((sv) => sv.key === key);
+    (0, utils_1.logBullet)(`Removing secret versions: ${secretsToPrune
+        .map((sv) => sv.key + "[" + sv.version + "]")
+        .join(", ")}`);
+    await Promise.all(secretsToPrune.map((sv) => (0, secretManager_1.destroySecretVersion)(projectId, sv.secret, sv.version)));
 });

package/lib/deploy/firestore/prepare.js

@@ -25,11 +25,11 @@ function prepareIndexes(context, options, databaseId, indexesFileName) {
 async function default_1(context, options) {
     if (options.only) {
         const targets = options.only.split(",");
-        const onlyIndexes = targets.indexOf("firestore:indexes") >= 0;
-        const onlyRules = targets.indexOf("firestore:rules") >= 0;
+        const excludeRules = targets.indexOf("firestore:indexes") >= 0;
+        const excludeIndexes = targets.indexOf("firestore:rules") >= 0;
         const onlyFirestore = targets.indexOf("firestore") >= 0;
-        context.firestoreIndexes = onlyIndexes || onlyFirestore;
-        context.firestoreRules = onlyRules || onlyFirestore;
+        context.firestoreIndexes = !excludeIndexes || onlyFirestore;
+        context.firestoreRules = !excludeRules || onlyFirestore;
     }
     else {
         context.firestoreIndexes = true;

package/lib/deploy/functions/prepare.js

@@ -295,7 +295,7 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         logger_1.logger.debug(`Building ${runtimeDelegate.name} source`);
         await runtimeDelegate.build();
         const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
-        (0, utils_1.logLabeledBullet)("functions", `Loading and anaylzing source code for codebase ${codebase} to determine what to deploy`);
+        (0, utils_1.logLabeledBullet)("functions", `Loading and analyzing source code for codebase ${codebase} to determine what to deploy`);
         wantBuilds[codebase] = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
         wantBuilds[codebase].runtime = codebaseConfig.runtime;
     }

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

@@ -223,12 +223,12 @@ class Fabricator {
     }
     async createV2Function(endpoint) {
         var _a, _b, _c, _d, _e;
-        const storage = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
-        if (!storage) {
+        const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
+        if (!storageSource) {
             logger_1.logger.debug("Precondition failed. Cannot create a GCFv2 function without storage");
             throw new Error("Precondition failed");
         }
-        const apiFunction = gcfV2.functionFromEndpoint(endpoint, storage);
+        const apiFunction = gcfV2.functionFromEndpoint(Object.assign(Object.assign({}, endpoint), { source: { storageSource } }));
         const topic = (_b = apiFunction.eventTrigger) === null || _b === void 0 ? void 0 : _b.pubsubTopic;
         if (topic) {
             await this.executor
@@ -368,12 +368,12 @@ class Fabricator {
     }
     async updateV2Function(endpoint) {
         var _a, _b, _c, _d;
-        const storage = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
-        if (!storage) {
+        const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
+        if (!storageSource) {
             logger_1.logger.debug("Precondition failed. Cannot update a GCFv2 function without storage");
             throw new Error("Precondition failed");
         }
-        const apiFunction = gcfV2.functionFromEndpoint(endpoint, storage);
+        const apiFunction = gcfV2.functionFromEndpoint(Object.assign(Object.assign({}, endpoint), { source: { storageSource } }));
         if ((_b = apiFunction.eventTrigger) === null || _b === void 0 ? void 0 : _b.pubsubTopic) {
             delete apiFunction.eventTrigger.pubsubTopic;
         }

package/lib/emulator/auth/operations.js

@@ -146,13 +146,13 @@ async function signUp(state, reqBody, ctx) {
             (0, errors_1.assert)(state.enableAnonymousUser, "ADMIN_ONLY_OPERATION");
         }
     }
-    if (typeof reqBody.email === "string") {
+    if (reqBody.email || (reqBody.email === "" && provider)) {
         (0, errors_1.assert)((0, utils_1.isValidEmailAddress)(reqBody.email), "INVALID_EMAIL");
         const email = (0, utils_1.canonicalizeEmailAddress)(reqBody.email);
         (0, errors_1.assert)(!state.getUserByEmail(email), "EMAIL_EXISTS");
         updates.email = email;
     }
-    if (typeof reqBody.password === "string") {
+    if (reqBody.password) {
         (0, errors_1.assert)(reqBody.password.length >= PASSWORD_MIN_LENGTH, `WEAK_PASSWORD : Password should be at least ${PASSWORD_MIN_LENGTH} characters`);
         updates.salt = "fakeSalt" + (0, utils_1.randomId)(20);
         updates.passwordHash = hashPassword(reqBody.password, updates.salt);

package/lib/emulator/functionsRuntimeWorker.js

@@ -84,7 +84,7 @@ class RuntimeWorker {
             });
         });
     }
-    request(req, resp, body) {
+    request(req, resp, body, debug) {
         if (this.triggerKey !== FREE_WORKER_KEY) {
             this.logInfo(`Beginning execution of "${this.triggerKey}"`);
         }
@@ -124,6 +124,10 @@ class RuntimeWorker {
                 const piped = _resp.pipe(resp);
                 piped.on("finish", () => finishReq("finish"));
             });
+            if (debug) {
+                proxy.setSocketKeepAlive(false);
+                proxy.setTimeout(0);
+            }
             proxy.on("timeout", () => {
                 this.logger.log("ERROR", `Your function timed out after ~${this.timeoutSeconds}s. To configure this timeout, see
       https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation.`);
@@ -260,7 +264,7 @@ class RuntimeWorkerPool {
         if (debug) {
             await worker.sendDebugMsg(debug);
         }
-        return worker.request(req, resp, body);
+        return worker.request(req, resp, body, !!debug);
     }
     getIdleWorker(triggerId) {
         this.cleanUpWorkers();

package/lib/ensureApiEnabled.js

@@ -27,6 +27,10 @@ async function check(projectId, apiName, prefix, silent = false) {
     return isEnabled;
 }
 exports.check = check;
+function isPermissionError(e) {
+    var _a, _b, _c;
+    return ((_c = (_b = (_a = e.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.status) === "PERMISSION_DENIED";
+}
 async function enable(projectId, apiName) {
     try {
         await apiClient.post(`/projects/${projectId}/services/${apiName}:enable`, undefined, {
@@ -40,7 +44,24 @@ async function enable(projectId, apiName) {
 
 https://console.firebase.google.com/project/${projectId}/usage/details`);
         }
-        throw err;
+        else if (isPermissionError(err)) {
+            const apiPermissionDeniedRegex = new RegExp(/Permission denied to enable service \[([.a-zA-Z]+)\]/);
+            const permissionsError = apiPermissionDeniedRegex.exec(err.message);
+            if (permissionsError && permissionsError[1]) {
+                const serviceUrl = permissionsError[1];
+                err.message = `Permissions denied enabling ${serviceUrl}.
+        Please ask a project owner to visit the following URL to enable this service:
+        
+        https://console.cloud.google.com/apis/library/${serviceUrl}?project=${projectId}`;
+                throw err;
+            }
+            else {
+                throw err;
+            }
+        }
+        else {
+            throw err;
+        }
     }
 }
 async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRetries, pollRetries = 0) {

package/lib/firestore/fsConfig.js

@@ -49,14 +49,21 @@ function getFirestoreConfig(projectId, options) {
             }
         }
         else if (database) {
-            if (allDatabases) {
+            if (allDatabases || onlyDatabases.has(database)) {
                 results.push(c);
+                onlyDatabases.delete(database);
             }
         }
         else {
             throw new error_1.FirebaseError('Must supply either "target" or "databaseId" in firestore config');
         }
     }
+    if (onlyDatabases.has("rules")) {
+        onlyDatabases.delete("rules");
+    }
+    if (onlyDatabases.has("indexes")) {
+        onlyDatabases.delete("indexes");
+    }
     if (!allDatabases && onlyDatabases.size !== 0) {
         throw new error_1.FirebaseError(`Could not find configurations in firebase.json for the following database targets: ${[
             ...onlyDatabases,

package/lib/frameworks/frameworks.js

@@ -13,6 +13,7 @@ const svelte = require("./svelte");
 const svelekit = require("./sveltekit");
 const react = require("./react");
 const vite = require("./vite");
+const flutter = require("./flutter");
 exports.WebFrameworks = {
     angular,
     astro,
@@ -26,4 +27,5 @@ exports.WebFrameworks = {
     svelekit,
     react,
     vite,
+    flutter,
 };

package/lib/frameworks/next/index.js

@@ -30,10 +30,6 @@ exports.support = "preview";
 exports.type = 2;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/nextjs";
 const DEFAULT_NUMBER_OF_REASONS_TO_LIST = 5;
-function getNextVersion(cwd) {
-    var _a;
-    return (_a = (0, utils_1.findDependency)("next", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
-}
 function getReactVersion(cwd) {
     var _a;
     return (_a = (0, utils_1.findDependency)("react-dom", { cwd, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
@@ -41,7 +37,7 @@ function getReactVersion(cwd) {
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
-    if (!(await (0, fs_extra_1.pathExists)("next.config.js")) && !getNextVersion(dir))
+    if (!(await (0, fs_extra_1.pathExists)("next.config.js")) && !(0, utils_2.getNextVersion)(dir))
         return;
     return { mayWantBackend: true, publicDirectory: (0, path_1.join)(dir, PUBLIC_DIR) };
 }
@@ -72,7 +68,7 @@ async function build(dir) {
     if (await (0, utils_2.isUsingMiddleware)((0, path_1.join)(dir, distDir), false)) {
         reasonsForBackend.add("middleware");
     }
-    if (await (0, utils_2.isUsingImageOptimization)((0, path_1.join)(dir, distDir))) {
+    if (await (0, utils_2.isUsingImageOptimization)(dir, distDir)) {
         reasonsForBackend.add(`Image Optimization`);
     }
     const prerenderManifest = await (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, constants_2.PRERENDER_MANIFEST));
@@ -349,8 +345,7 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
         await (0, promises_1.mkdir)((0, path_1.join)(destDir, "public"));
         await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, "public"), (0, path_1.join)(destDir, "public"));
     }
-    if (!(await (0, utils_2.hasUnoptimizedImage)(sourceDir, distDir)) &&
-        ((0, utils_2.usesAppDirRouter)(sourceDir) || (await (0, utils_2.usesNextImage)(sourceDir, distDir)))) {
+    if (await (0, utils_2.isUsingImageOptimization)(sourceDir, distDir)) {
         packageJson.dependencies["sharp"] = constants_1.SHARP_VERSION;
     }
     await (0, fs_extra_1.mkdirp)((0, path_1.join)(destDir, distDir));
@@ -386,7 +381,7 @@ async function getConfig(dir) {
     var _b;
     let config = {};
     if ((0, fs_1.existsSync)((0, path_1.join)(dir, "next.config.js"))) {
-        const version = getNextVersion(dir);
+        const version = (0, utils_2.getNextVersion)(dir);
         if (!version)
             throw new Error("Unable to find the next dep, try NPM installing?");
         if ((0, semver_1.gte)(version, "12.0.0")) {

package/lib/frameworks/next/utils.js

@@ -1,13 +1,22 @@
 "use strict";
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
+exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
+const promises_1 = require("fs/promises");
+const glob_1 = require("glob");
+const semver_1 = require("semver");
 const utils_1 = require("../utils");
 const constants_1 = require("./constants");
 const fsutils_1 = require("../../fsutils");
-const promises_1 = require("fs/promises");
 exports.I18N_SOURCE = /\/:nextInternalLocale(\([^\)]+\))?/;
 function cleanEscapedChars(path) {
     return path.replace(/\\([(){}:+?*])/g, (a, b) => b);
@@ -84,20 +93,49 @@ async function isUsingMiddleware(dir, isDevMode) {
     }
 }
 exports.isUsingMiddleware = isUsingMiddleware;
-async function isUsingImageOptimization(dir) {
-    let { isNextImageImported } = await (0, utils_1.readJSON)((0, path_1.join)(dir, constants_1.EXPORT_MARKER));
-    if (!isNextImageImported && isUsingAppDirectory(dir)) {
-        isNextImageImported = (await (0, promises_1.readFile)((0, path_1.join)(dir, "server", "client-reference-manifest.js")))
-            .toString()
-            .includes("node_modules/next/dist/client/image.js");
+async function isUsingImageOptimization(projectDir, distDir) {
+    let isNextImageImported = await usesNextImage(projectDir, distDir);
+    if (!isNextImageImported && isUsingAppDirectory((0, path_1.join)(projectDir, distDir))) {
+        if (await isUsingNextImageInAppDirectory(projectDir, distDir)) {
+            isNextImageImported = true;
+        }
     }
     if (isNextImageImported) {
-        const imagesManifest = await (0, utils_1.readJSON)((0, path_1.join)(dir, constants_1.IMAGES_MANIFEST));
+        const imagesManifest = await (0, utils_1.readJSON)((0, path_1.join)(projectDir, distDir, constants_1.IMAGES_MANIFEST));
         return !imagesManifest.images.unoptimized;
     }
     return false;
 }
 exports.isUsingImageOptimization = isUsingImageOptimization;
+async function isUsingNextImageInAppDirectory(projectDir, nextDir) {
+    var _a, e_1, _b, _c;
+    const { found: files } = new glob_1.Glob((0, path_1.join)(projectDir, nextDir, "server", "**", "*client-reference-manifest.js"));
+    try {
+        for (var _d = true, files_1 = __asyncValues(files), files_1_1; files_1_1 = await files_1.next(), _a = files_1_1.done, !_a;) {
+            _c = files_1_1.value;
+            _d = false;
+            try {
+                const filepath = _c;
+                const fileContents = await (0, promises_1.readFile)(filepath);
+                if (fileContents.includes("node_modules/next/dist/client/image")) {
+                    return true;
+                }
+            }
+            finally {
+                _d = true;
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (!_d && !_a && (_b = files_1.return)) await _b.call(files_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return false;
+}
+exports.isUsingNextImageInAppDirectory = isUsingNextImageInAppDirectory;
 function isUsingAppDirectory(dir) {
     const appPathRoutesManifestPath = (0, path_1.join)(dir, constants_1.APP_PATH_ROUTES_MANIFEST);
     return (0, fsutils_1.fileExistsSync)(appPathRoutesManifestPath);
@@ -172,3 +210,13 @@ async function getBuildId(distDir) {
     return buildId.toString();
 }
 exports.getBuildId = getBuildId;
+function getNextVersion(cwd) {
+    const dependency = (0, utils_1.findDependency)("next", { cwd, depth: 0, omitDev: false });
+    if (!dependency)
+        return undefined;
+    const nextVersionSemver = (0, semver_1.coerce)(dependency.version);
+    if (!nextVersionSemver)
+        return dependency.version;
+    return nextVersionSemver.toString();
+}
+exports.getNextVersion = getNextVersion;

package/lib/functions/secrets.js

@@ -1,20 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = exports.ensureApi = exports.labels = exports.isFirebaseManaged = void 0;
+exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.versionInUse = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = exports.ensureApi = exports.labels = exports.isFirebaseManaged = void 0;
 const utils = require("../utils");
 const poller = require("../operation-poller");
-const gcf = require("../gcp/cloudfunctions");
+const gcfV1 = require("../gcp/cloudfunctions");
+const gcfV2 = require("../gcp/cloudfunctionsv2");
 const ensureApiEnabled = require("../ensureApiEnabled");
+const api_1 = require("../api");
 const secretManager_1 = require("../gcp/secretManager");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const prompt_1 = require("../prompt");
 const env_1 = require("./env");
 const logger_1 = require("../logger");
-const api_1 = require("../api");
 const functional_1 = require("../functional");
 const projectUtils_1 = require("../projectUtils");
 const FIREBASE_MANAGED = "firebase-managed";
+const gcfV1PollerOptions = {
+    apiOrigin: api_1.functionsOrigin,
+    apiVersion: "v1",
+    masterTimeout: 25 * 60 * 1000,
+    maxBackoff: 10000,
+};
+const gcfV2PollerOptions = {
+    apiOrigin: api_1.functionsV2Origin,
+    apiVersion: "v2",
+    masterTimeout: 25 * 60 * 1000,
+    maxBackoff: 10000,
+};
 function isFirebaseManaged(secret) {
     return Object.keys(secret.labels || []).includes(FIREBASE_MANAGED);
 }
@@ -110,6 +123,18 @@ function inUse(projectInfo, secret, endpoint) {
     return false;
 }
 exports.inUse = inUse;
+function versionInUse(projectInfo, sv, endpoint) {
+    const { projectId, projectNumber } = projectInfo;
+    for (const sev of of([endpoint])) {
+        if ((sev.projectId === projectId || sev.projectId === projectNumber) &&
+            sev.secret === sv.secret.name &&
+            sev.version === sv.versionId) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.versionInUse = versionInUse;
 async function pruneSecrets(projectInfo, endpoints) {
     const { projectId, projectNumber } = projectInfo;
     const pruneKey = (name, version) => `${name}@${version}`;
@@ -191,26 +216,21 @@ async function updateEndpointSecret(projectInfo, secretVersion, endpoint) {
         updatedSevs.push(updatedSev);
     }
     if (endpoint.platform === "gcfv1") {
-        const fn = gcf.functionFromEndpoint(endpoint, "");
-        const op = await gcf.updateFunction({
+        const fn = gcfV1.functionFromEndpoint(endpoint, "");
+        const op = await gcfV1.updateFunction({
             name: fn.name,
             runtime: fn.runtime,
             entryPoint: fn.entryPoint,
             secretEnvironmentVariables: updatedSevs,
         });
-        const gcfV1PollerOptions = {
-            apiOrigin: api_1.functionsOrigin,
-            apiVersion: gcf.API_VERSION,
-            masterTimeout: 25 * 60 * 1000,
-            maxBackoff: 10000,
-            pollerName: `update-${endpoint.region}-${endpoint.id}`,
-            operationResourceName: op.name,
-        };
-        const cfn = await poller.pollOperation(gcfV1PollerOptions);
-        return gcf.endpointFromFunction(cfn);
+        const cfn = await poller.pollOperation(Object.assign(Object.assign({}, gcfV1PollerOptions), { operationResourceName: op.name }));
+        return gcfV1.endpointFromFunction(cfn);
     }
     else if (endpoint.platform === "gcfv2") {
-        throw new error_1.FirebaseError(`Unsupported platform ${endpoint.platform}`);
+        const fn = gcfV2.functionFromEndpoint(endpoint);
+        const op = await gcfV2.updateFunction(Object.assign(Object.assign({}, fn), { serviceConfig: Object.assign(Object.assign({}, fn.serviceConfig), { secretEnvironmentVariables: updatedSevs }) }));
+        const cfn = await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { operationResourceName: op.name }));
+        return gcfV2.endpointFromFunction(cfn);
     }
     else {
         (0, functional_1.assertExhaustive)(endpoint.platform);

package/lib/functionsShellCommandAction.js

@@ -6,16 +6,17 @@ const repl = require("repl");
 const _ = require("lodash");
 const request = require("request");
 const util = require("util");
+const shell = require("./emulator/functionsEmulatorShell");
+const commandUtils = require("./emulator/commandUtils");
 const functions_1 = require("./serve/functions");
-const LocalFunction = require("./localFunction");
+const localFunction_1 = require("./localFunction");
 const utils = require("./utils");
 const logger_1 = require("./logger");
-const shell = require("./emulator/functionsEmulatorShell");
-const commandUtils = require("./emulator/commandUtils");
 const types_1 = require("./emulator/types");
 const hubClient_1 = require("./emulator/hubClient");
 const portUtils_1 = require("./emulator/portUtils");
 const constants_1 = require("./emulator/constants");
+const projectUtils_1 = require("./projectUtils");
 const serveFunctions = new functions_1.FunctionsServer();
 const actionFunction = async (options) => {
     var _a, _b, _c, _d, _e, _f;
@@ -26,7 +27,7 @@ const actionFunction = async (options) => {
     if (options.inspectFunctions) {
         debugPort = commandUtils.parseInspectionPort(options);
     }
-    utils.assertDefined(options.project);
+    (0, projectUtils_1.needProjectId)(options);
     const hubClient = new hubClient_1.EmulatorHubClient(options.project);
     let remoteEmulators = {};
     if (hubClient.foundHub()) {
@@ -73,9 +74,9 @@ const actionFunction = async (options) => {
         const initializeContext = (context) => {
             for (const trigger of emulator.triggers) {
                 if (emulator.emulatedFunctions.includes(trigger.id)) {
-                    const localFunction = new LocalFunction(trigger, emulator.urls, emulator);
+                    const localFunction = new localFunction_1.default(trigger, emulator.urls, emulator);
                     const triggerNameDotNotation = trigger.name.replace(/-/g, ".");
-                    _.set(context, triggerNameDotNotation, localFunction.call);
+                    _.set(context, triggerNameDotNotation, localFunction.makeFn());
                 }
             }
             context.help =

package/lib/gcp/cloudfunctionsv2.js

@@ -168,8 +168,8 @@ async function deleteFunction(cloudFunction) {
     }
 }
 exports.deleteFunction = deleteFunction;
-function functionFromEndpoint(endpoint, source) {
-    var _a, _b;
+function functionFromEndpoint(endpoint) {
+    var _a, _b, _c;
     if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
@@ -183,7 +183,7 @@ function functionFromEndpoint(endpoint, source) {
             runtime: endpoint.runtime,
             entryPoint: endpoint.entryPoint,
             source: {
-                storageSource: source,
+                storageSource: (_a = endpoint.source) === null || _a === void 0 ? void 0 : _a.storageSource,
             },
             environmentVariables: {},
         },
@@ -213,7 +213,7 @@ function functionFromEndpoint(endpoint, source) {
             eventType: endpoint.eventTrigger.eventType,
         };
         if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
-            if (!((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.topic)) {
+            if (!((_b = endpoint.eventTrigger.eventFilters) === null || _b === void 0 ? void 0 : _b.topic)) {
                 throw new error_1.FirebaseError("Error: Pub/Sub event trigger is missing topic: " +
                     JSON.stringify(endpoint.eventTrigger, null, 2));
             }
@@ -262,7 +262,7 @@ function functionFromEndpoint(endpoint, source) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.CODEBASE_LABEL]: codebase });
     }
     else {
-        (_b = gcfFunction.labels) === null || _b === void 0 ? true : delete _b[constants_1.CODEBASE_LABEL];
+        (_c = gcfFunction.labels) === null || _c === void 0 ? true : delete _c[constants_1.CODEBASE_LABEL];
     }
     if (endpoint.hash) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.HASH_LABEL]: endpoint.hash });
@@ -335,7 +335,7 @@ function endpointFromFunction(gcfFunction) {
     }
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
         project,
-        region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime });
+        region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, source: gcfFunction.buildConfig.source });
     if (gcfFunction.serviceConfig) {
         proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds", "uri");
         proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccount", "serviceAccountEmail");
@@ -346,7 +346,7 @@ function endpointFromFunction(gcfFunction) {
             }
             const mem = mebibytes(prod);
             if (!backend.isValidMemoryOption(mem)) {
-                logger_1.logger.warn("Converting a function to an endpoint with an invalid memory option", mem);
+                logger_1.logger.debug("Converting a function to an endpoint with an invalid memory option", mem);
             }
             return mem;
         });

package/lib/localFunction.js

@@ -1,191 +1,204 @@
 "use strict";
-var _ = require("lodash");
-var request = require("request");
-var { encodeFirestoreValue } = require("./firestore/encodeFirestoreValue");
-var utils = require("./utils");
-var LocalFunction = function (trigger, urls, controller) {
-    const isCallable = _.get(trigger, ["labels", "deployment-callable"], "false");
-    this.id = trigger.id;
-    this.name = trigger.name;
-    this.eventTrigger = trigger.eventTrigger;
-    this.httpsTrigger = trigger.httpsTrigger;
-    this.controller = controller;
-    this.url = _.get(urls, this.id);
-    if (this.httpsTrigger) {
-        if (isCallable == "true") {
-            this.call = this._constructCallableFunc.bind(this);
-        }
-        else {
-            this.call = request.defaults({
-                callback: this._requestCallBack,
-                baseUrl: this.url,
-                uri: "",
-            });
-        }
+Object.defineProperty(exports, "__esModule", { value: true });
+const request = require("request");
+const utils = require("./utils");
+const encodeFirestoreValue_1 = require("./firestore/encodeFirestoreValue");
+class LocalFunction {
+    constructor(trigger, urls, controller) {
+        this.trigger = trigger;
+        this.controller = controller;
+        this.paramWildcardRegex = new RegExp("{[^/{}]*}", "g");
+        this.url = urls[trigger.id];
     }
-    else {
-        this.call = this._call.bind(this);
-    }
-};
-LocalFunction.prototype._isDatabaseFunc = function (eventTrigger) {
-    return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Database";
-};
-LocalFunction.prototype._isFirestoreFunc = function (eventTrigger) {
-    return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Firestore";
-};
-LocalFunction.prototype._substituteParams = function (resource, params) {
-    var wildcardRegex = new RegExp("{[^/{}]*}", "g");
-    return resource.replace(wildcardRegex, function (wildcard) {
-        var wildcardNoBraces = wildcard.slice(1, -1);
-        var sub = _.get(params, wildcardNoBraces);
-        return sub || wildcardNoBraces + utils.randomInt(1, 9);
-    });
-};
-LocalFunction.prototype._constructCallableFunc = function (data, opts) {
-    opts = opts || {};
-    var headers = {};
-    if (opts.instanceIdToken) {
-        headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
+    substituteParams(resource, params) {
+        if (!params) {
+            return resource;
+        }
+        return resource.replace(this.paramWildcardRegex, (wildcard) => {
+            const wildcardNoBraces = wildcard.slice(1, -1);
+            const sub = params === null || params === void 0 ? void 0 : params[wildcardNoBraces];
+            return sub || `${wildcardNoBraces}${utils.randomInt(1, 9)}`;
+        });
     }
-    return request.post({
-        callback: this._requestCallBack,
-        baseUrl: this.url,
-        uri: "",
-        body: { data: data },
-        json: true,
-        headers: headers,
-    });
-};
-LocalFunction.prototype._constructAuth = function (auth, authType) {
-    if (_.get(auth, "admin") || _.get(auth, "variable")) {
-        return auth;
+    constructCallableFunc(data, opts) {
+        opts = opts || {};
+        const headers = {};
+        if (opts.instanceIdToken) {
+            headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
+        }
+        return request.post({
+            callback: (...args) => this.requestCallBack(...args),
+            baseUrl: this.url,
+            uri: "",
+            body: { data },
+            json: true,
+            headers: headers,
+        });
     }
-    if (typeof authType !== "undefined") {
-        switch (authType) {
-            case "USER":
-                return {
-                    variable: {
-                        uid: _.get(auth, "uid", ""),
-                        token: _.get(auth, "token", {}),
-                    },
-                };
-            case "ADMIN":
-                if (_.get(auth, "uid") || _.get(auth, "token")) {
-                    throw new Error("authType and auth are incompatible.");
-                }
-                return { admin: true };
-            case "UNAUTHENTICATED":
-                if (_.get(auth, "uid") || _.get(auth, "token")) {
-                    throw new Error("authType and auth are incompatible.");
-                }
-                return { admin: false };
-            default:
-                throw new Error("Unrecognized authType, valid values are: " + "ADMIN, USER, and UNAUTHENTICATED");
+    constructAuth(auth, authType) {
+        var _a, _b, _c;
+        if ((auth === null || auth === void 0 ? void 0 : auth.admin) || (auth === null || auth === void 0 ? void 0 : auth.variable)) {
+            return {
+                admin: auth.admin || false,
+                variable: auth.variable,
+            };
         }
+        if (authType) {
+            switch (authType) {
+                case "USER":
+                    return {
+                        admin: false,
+                        variable: {
+                            uid: (_a = auth === null || auth === void 0 ? void 0 : auth.uid) !== null && _a !== void 0 ? _a : "",
+                            token: (_b = auth === null || auth === void 0 ? void 0 : auth.token) !== null && _b !== void 0 ? _b : {},
+                        },
+                    };
+                case "ADMIN":
+                    if ((auth === null || auth === void 0 ? void 0 : auth.uid) || (auth === null || auth === void 0 ? void 0 : auth.token)) {
+                        throw new Error("authType and auth are incompatible.");
+                    }
+                    return { admin: true };
+                case "UNAUTHENTICATED":
+                    if ((auth === null || auth === void 0 ? void 0 : auth.uid) || (auth === null || auth === void 0 ? void 0 : auth.token)) {
+                        throw new Error("authType and auth are incompatible.");
+                    }
+                    return { admin: false };
+                default:
+                    throw new Error("Unrecognized authType, valid values are: " + "ADMIN, USER, and UNAUTHENTICATED");
+            }
+        }
+        if (auth) {
+            return {
+                admin: false,
+                variable: {
+                    uid: (_c = auth.uid) !== null && _c !== void 0 ? _c : "",
+                    token: auth.token || {},
+                },
+            };
+        }
+        return { admin: true };
     }
-    if (auth) {
+    makeFirestoreValue(input) {
+        if (typeof input === "undefined" ||
+            input === null ||
+            (typeof input === "object" && Object.keys(input).length === 0)) {
+            return {};
+        }
+        if (typeof input !== "object") {
+            throw new Error("Firestore data must be key-value pairs.");
+        }
+        const currentTime = new Date().toISOString();
         return {
-            variable: {
-                uid: auth.uid,
-                token: auth.token || {},
-            },
+            fields: (0, encodeFirestoreValue_1.encodeFirestoreValue)(input),
+            createTime: currentTime,
+            updateTime: currentTime,
         };
     }
-    return { admin: true };
-};
-LocalFunction.prototype._makeFirestoreValue = function (input) {
-    if (typeof input === "undefined" || _.isEmpty(input)) {
-        return {};
-    }
-    if (typeof input !== "object") {
-        throw new Error("Firestore data must be key-value pairs.");
-    }
-    var currentTime = new Date().toISOString();
-    return {
-        fields: encodeFirestoreValue(input),
-        createTime: currentTime,
-        updateTime: currentTime,
-    };
-};
-LocalFunction.prototype._requestCallBack = function (err, response, body) {
-    if (err) {
-        return console.warn("\nERROR SENDING REQUEST: " + err);
-    }
-    var status = response ? response.statusCode + ", " : "";
-    var bodyString = body;
-    if (typeof body === "string") {
-        try {
-            bodyString = JSON.stringify(JSON.parse(bodyString), null, 2);
+    requestCallBack(err, response, body) {
+        if (err) {
+            return console.warn("\nERROR SENDING REQUEST: " + err);
         }
-        catch (e) {
+        const status = response ? response.statusCode + ", " : "";
+        let bodyString = body;
+        if (typeof bodyString === "string") {
+            try {
+                bodyString = JSON.stringify(JSON.parse(bodyString), null, 2);
+            }
+            catch (e) {
+            }
+        }
+        else {
+            bodyString = JSON.stringify(body, null, 2);
         }
+        return console.log("\nRESPONSE RECEIVED FROM FUNCTION: " + status + bodyString);
     }
-    else {
-        bodyString = JSON.stringify(body, null, 2);
+    isDatabaseFn(eventTrigger) {
+        return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Database";
     }
-    return console.log("\nRESPONSE RECEIVED FROM FUNCTION: " + status + bodyString);
-};
-LocalFunction.prototype._call = function (data, opts) {
-    opts = opts || {};
-    var operationType;
-    var dataPayload;
-    if (this.httpsTrigger) {
-        this.controller.call(this.name, data || {});
+    isFirestoreFunc(eventTrigger) {
+        return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Firestore";
     }
-    else if (this.eventTrigger) {
-        if (this._isDatabaseFunc(this.eventTrigger)) {
-            operationType = utils.last(this.eventTrigger.eventType.split("."));
-            switch (operationType) {
-                case "create":
-                    dataPayload = {
-                        data: null,
-                        delta: data,
-                    };
-                    break;
-                case "delete":
-                    dataPayload = {
-                        data: data,
-                        delta: null,
-                    };
-                    break;
-                default:
-                    dataPayload = {
-                        data: data.before,
-                        delta: data.after,
-                    };
+    triggerEvent(data, opts) {
+        opts = opts || {};
+        let operationType;
+        let dataPayload;
+        if (this.trigger.httpsTrigger) {
+            this.controller.call(this.trigger.name, data || {}, opts);
+        }
+        else if (this.trigger.eventTrigger) {
+            if (this.isDatabaseFn(this.trigger.eventTrigger)) {
+                operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
+                switch (operationType) {
+                    case "create":
+                        dataPayload = {
+                            data: null,
+                            delta: data,
+                        };
+                        break;
+                    case "delete":
+                        dataPayload = {
+                            data: data,
+                            delta: null,
+                        };
+                        break;
+                    default:
+                        dataPayload = {
+                            data: data.before,
+                            delta: data.after,
+                        };
+                }
+                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
+                opts.auth = this.constructAuth(opts.auth, opts.authType);
+                this.controller.call(this.trigger.name, dataPayload, opts);
+            }
+            else if (this.isFirestoreFunc(this.trigger.eventTrigger)) {
+                operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
+                switch (operationType) {
+                    case "create":
+                        dataPayload = {
+                            value: this.makeFirestoreValue(data),
+                            oldValue: {},
+                        };
+                        break;
+                    case "delete":
+                        dataPayload = {
+                            value: {},
+                            oldValue: this.makeFirestoreValue(data),
+                        };
+                        break;
+                    default:
+                        dataPayload = {
+                            value: this.makeFirestoreValue(data.after),
+                            oldValue: this.makeFirestoreValue(data.before),
+                        };
+                }
+                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
+                this.controller.call(this.trigger.name, dataPayload, opts);
+            }
+            else {
+                this.controller.call(this.trigger.name, data || {}, opts);
             }
-            opts.resource = this._substituteParams(this.eventTrigger.resource, opts.params);
-            opts.auth = this._constructAuth(opts.auth, opts.authType);
-            this.controller.call(this.name, dataPayload, opts);
         }
-        else if (this._isFirestoreFunc(this.eventTrigger)) {
-            operationType = utils.last(this.eventTrigger.eventType.split("."));
-            switch (operationType) {
-                case "create":
-                    dataPayload = {
-                        value: this._makeFirestoreValue(data),
-                        oldValue: {},
-                    };
-                    break;
-                case "delete":
-                    dataPayload = {
-                        value: {},
-                        oldValue: this._makeFirestoreValue(data),
-                    };
-                    break;
-                default:
-                    dataPayload = {
-                        value: this._makeFirestoreValue(data.after),
-                        oldValue: this._makeFirestoreValue(data.before),
-                    };
+        return console.log("Successfully invoked function.");
+    }
+    makeFn() {
+        var _a;
+        if (this.trigger.httpsTrigger) {
+            const isCallable = !!((_a = this.trigger.labels) === null || _a === void 0 ? void 0 : _a["deployment-callable"]);
+            if (isCallable) {
+                return (data, opt) => this.constructCallableFunc(data, opt);
+            }
+            else {
+                return request.defaults({
+                    callback: (...args) => this.requestCallBack(...args),
+                    baseUrl: this.url,
+                    uri: "",
+                });
             }
-            opts.resource = this._substituteParams(this.eventTrigger.resource, opts.params);
-            this.controller.call(this.name, dataPayload, opts);
         }
         else {
-            this.controller.call(this.name, data || {}, opts);
+            return (data, opt) => this.triggerEvent(data, opt);
         }
     }
-    return "Successfully invoked function.";
-};
-module.exports = LocalFunction;
+}
+exports.default = LocalFunction;

package/lib/requireAuth.js

@@ -24,6 +24,14 @@ async function autoAuth(options, authScopes) {
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
+    let clientEmail;
+    try {
+        const credentials = await client.getCredentials();
+        clientEmail = credentials.client_email;
+    }
+    catch (e) {
+        logger_1.logger.debug(`Error getting account credentials.`);
+    }
     if (!options.isVSCE && (0, monospace_1.isMonospaceEnv)()) {
         await (0, monospace_1.selectProjectInMonospace)({
             projectRoot: options.config.projectDir,
@@ -31,6 +39,7 @@ async function autoAuth(options, authScopes) {
             isVSCE: options.isVSCE,
         });
     }
+    return clientEmail;
 }
 async function requireAuth(options) {
     api.setScopes([scopes.CLOUD_PLATFORM, scopes.FIREBASE_PLATFORM]);

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const _ = require("lodash");
 const url = require("url");
 const clc = require("colorette");
@@ -375,14 +375,6 @@ function thirtyDaysFromNow() {
     return new Date(Date.now() + THIRTY_DAYS_IN_MILLISECONDS);
 }
 exports.thirtyDaysFromNow = thirtyDaysFromNow;
-function assertDefined(val, message) {
-    if (val === undefined || val === null) {
-        throw new assert_1.AssertionError({
-            message: message || `expected value to be defined but got "${val}"`,
-        });
-    }
-}
-exports.assertDefined = assertDefined;
 function assertIsString(val, message) {
     if (typeof val !== "string") {
         throw new assert_1.AssertionError({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.4.3",
+  "version": "12.4.5",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -99,11 +99,11 @@
     "p-limit": "^3.0.1",
     "portfinder": "^1.0.32",
     "progress": "^2.0.3",
-    "proxy-agent": "^5.0.0",
+    "proxy-agent": "^6.3.0",
     "request": "^2.87.0",
     "retry": "^0.13.1",
     "rimraf": "^3.0.0",
-    "semver": "^5.7.1",
+    "semver": "^7.5.2",
     "stream-chain": "^2.2.4",
     "stream-json": "^1.7.3",
     "strip-ansi": "^6.0.1",

package/standalone/package.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^2.4.2",
-    "npm": "^6.10.2",
+    "npm": "^9.8.0",
     "shelljs": "^0.8.3",
     "shx": "^0.3.2",
     "user-home": "^2.0.0"

package/lib/gcp/firedata.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.listDatabaseInstances = void 0;
-const api_1 = require("../api");
-const apiv2_1 = require("../apiv2");
-const logger_1 = require("../logger");
-const utils = require("../utils");
-function _handleErrorResponse(response) {
-    if (response.body && response.body.error) {
-        return utils.reject(response.body.error, { code: 2 });
-    }
-    logger_1.logger.debug("[firedata] error:", response.status, response.body);
-    return utils.reject("Unexpected error encountered with FireData.", {
-        code: 2,
-    });
-}
-async function listDatabaseInstances(projectNumber) {
-    const client = new apiv2_1.Client({ urlPrefix: api_1.firedataOrigin, apiVersion: "v1" });
-    const response = await client.get(`/projects/${projectNumber}/databases`, {
-        resolveOnHTTPError: true,
-    });
-    if (response.status === 200) {
-        return response.body.instance;
-    }
-    return _handleErrorResponse(response);
-}
-exports.listDatabaseInstances = listDatabaseInstances;