firebase-tools 12.4.4 → 12.4.6

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");
@@ -146,7 +146,7 @@ class Client {
         if (accessToken) {
             return accessToken;
         }
-        const data = (await auth.getAccessToken(refreshToken, []));
+        const data = await auth.getAccessToken(refreshToken, []);
         return data.access_token;
     }
     requestURL(options) {
@@ -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;

package/lib/auth.js

@@ -509,7 +509,7 @@ async function refreshTokens(refreshToken, authScopes) {
     }
 }
 async function getAccessToken(refreshToken, authScopes) {
-    if (haveValidTokens(refreshToken, authScopes)) {
+    if (haveValidTokens(refreshToken, authScopes) && lastAccessToken) {
         return lastAccessToken;
     }
     return refreshTokens(refreshToken, authScopes);

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

@@ -88,6 +88,7 @@ exports.Constants = Constants;
 Constants.FAKE_PROJECT_ID_PREFIX = "demo-";
 Constants.FAKE_PROJECT_NUMBER = "0";
 Constants.DEFAULT_DATABASE_EMULATOR_NAMESPACE = "fake-server";
+Constants.FIREBASE_ENABLED_EXPERIMENTS = "FIREBASE_ENABLED_EXPERIMENTS";
 Constants.FIRESTORE_EMULATOR_HOST = "FIRESTORE_EMULATOR_HOST";
 Constants.FIRESTORE_EMULATOR_ENV_ALT = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
 Constants.FIREBASE_DATABASE_EMULATOR_HOST = "FIREBASE_DATABASE_EMULATOR_HOST";

package/lib/emulator/ui.js

@@ -8,6 +8,7 @@ const error_1 = require("../error");
 const constants_1 = require("./constants");
 const track_1 = require("../track");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
+const experiments_1 = require("../experiments");
 class EmulatorUI {
     constructor(args) {
         this.args = args;
@@ -26,6 +27,8 @@ class EmulatorUI {
         if (session) {
             env[constants_1.Constants.FIREBASE_GA_SESSION] = JSON.stringify(session);
         }
+        const enabledExperiments = Object.keys(experiments_1.ALL_EXPERIMENTS).filter((experimentName) => (0, experiments_1.isEnabled)(experimentName));
+        env[constants_1.Constants.FIREBASE_ENABLED_EXPERIMENTS] = JSON.stringify(enabledExperiments);
         return downloadableEmulators.start(types_1.Emulators.UI, { auto_download: autoDownload }, env);
     }
     connect() {

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/extensions/tos.js

@@ -39,36 +39,48 @@ async function acceptPublisherTOS(projectId, tosVersion) {
 }
 exports.acceptPublisherTOS = acceptPublisherTOS;
 async function acceptLatestPublisherTOS(options, projectId) {
-    logger_1.logger.debug(`Checking if latest publisher TOS has been accepted by ${projectId}...`);
-    const currentAcceptance = await getPublisherTOSStatus(projectId);
-    if (currentAcceptance.lastAcceptedVersion) {
-        logger_1.logger.debug(`Already accepted version ${currentAcceptance.lastAcceptedVersion} of Extensions publisher TOS.`);
-        return currentAcceptance;
-    }
-    else {
-        const tosLink = extensionsTosUrl("publisher");
-        logger_1.logger.info(`To continue, you must accept the Firebase Extensions Publisher Terms of Service: ${tosLink}`);
-        if (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions Publisher Terms of Service?" }))) {
-            return acceptPublisherTOS(projectId, currentAcceptance.latestTosVersion);
+    try {
+        logger_1.logger.debug(`Checking if latest publisher TOS has been accepted by ${projectId}...`);
+        const currentAcceptance = await getPublisherTOSStatus(projectId);
+        if (currentAcceptance.lastAcceptedVersion) {
+            logger_1.logger.debug(`Already accepted version ${currentAcceptance.lastAcceptedVersion} of Extensions publisher TOS.`);
+            return currentAcceptance;
+        }
+        else {
+            const tosLink = extensionsTosUrl("publisher");
+            logger_1.logger.info(`To continue, you must accept the Firebase Extensions Publisher Terms of Service: ${tosLink}`);
+            if (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions Publisher Terms of Service?" }))) {
+                return acceptPublisherTOS(projectId, currentAcceptance.latestTosVersion);
+            }
         }
-        throw new error_1.FirebaseError("You must accept the terms of service to continue.");
     }
+    catch (err) {
+        logger_1.logger.debug(`Error when checking Publisher TOS for ${projectId}. This is expected if authenticated via a service account: ${err}`);
+        return;
+    }
+    throw new error_1.FirebaseError("You must accept the terms of service to continue.");
 }
 exports.acceptLatestPublisherTOS = acceptLatestPublisherTOS;
 async function acceptLatestAppDeveloperTOS(options, projectId, instanceIds) {
-    logger_1.logger.debug(`Checking if latest AppDeveloper TOS has been accepted by ${projectId}...`);
-    displayDeveloperTOSWarning();
-    const currentAcceptance = await getAppDeveloperTOSStatus(projectId);
-    if (currentAcceptance.lastAcceptedVersion) {
-        logger_1.logger.debug(`User Terms of Service aready accepted on project ${projectId}.`);
+    try {
+        logger_1.logger.debug(`Checking if latest AppDeveloper TOS has been accepted by ${projectId}...`);
+        displayDeveloperTOSWarning();
+        const currentAcceptance = await getAppDeveloperTOSStatus(projectId);
+        if (currentAcceptance.lastAcceptedVersion) {
+            logger_1.logger.debug(`User Terms of Service aready accepted on project ${projectId}.`);
+        }
+        else if (!(await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions User Terms of Service?" })))) {
+            throw new error_1.FirebaseError("You must accept the terms of service to continue.");
+        }
+        const tosPromises = instanceIds.map((instanceId) => {
+            return acceptAppDeveloperTOS(projectId, currentAcceptance.latestTosVersion, instanceId);
+        });
+        return Promise.all(tosPromises);
     }
-    else if (!(await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions User Terms of Service?" })))) {
-        throw new error_1.FirebaseError("You must accept the terms of service to continue.");
+    catch (err) {
+        logger_1.logger.debug(`Error when checking App Developer TOS for ${projectId}. This is expected if authenticated via a service account: ${err}`);
+        return [];
     }
-    const tosPromises = instanceIds.map((instanceId) => {
-        return acceptAppDeveloperTOS(projectId, currentAcceptance.latestTosVersion, instanceId);
-    });
-    return Promise.all(tosPromises);
 }
 exports.acceptLatestAppDeveloperTOS = acceptLatestAppDeveloperTOS;
 function displayDeveloperTOSWarning() {

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,15 @@
 "use strict";
 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 +86,31 @@ 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) {
+    const files = (0, glob_1.sync)((0, path_1.join)(projectDir, nextDir, "server", "**", "*client-reference-manifest.js"));
+    for (const filepath of files) {
+        const fileContents = await (0, promises_1.readFile)(filepath);
+        if (fileContents.includes("node_modules/next/dist/client/image")) {
+            return true;
+        }
+    }
+    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 +185,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_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()) {

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/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.4",
+  "version": "12.4.6",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -99,7 +99,7 @@
     "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",