firebase-tools 13.14.2 → 13.15.1

package/lib/extensions/extensionsHelper.js

@@ -1,6 +1,13 @@
 "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.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
+exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
 const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
@@ -9,11 +16,9 @@ const fs = require("fs-extra");
 const node_fetch_1 = require("node-fetch");
 const path = require("path");
 const marked_1 = require("marked");
+const marked_terminal_1 = require("marked-terminal");
 const unzip_1 = require("./../unzip");
-const TerminalRenderer = require("marked-terminal");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
+marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const api_1 = require("../api");
 const archiveDirectory_1 = require("../archiveDirectory");
 const utils_1 = require("./utils");
@@ -128,6 +133,38 @@ function substituteParams(original, params) {
     return JSON.parse(s);
 }
 exports.substituteParams = substituteParams;
+async function substituteSecretParams(projectNumber, params) {
+    var _a, e_1, _b, _c;
+    const newParams = {};
+    try {
+        for (var _d = true, _e = __asyncValues(Object.entries(params)), _f; _f = await _e.next(), _a = _f.done, !_a;) {
+            _c = _f.value;
+            _d = false;
+            try {
+                const [key, value] = _c;
+                if (typeof value !== "string") {
+                    newParams[key] =
+                        `projects/${projectNumber}/secrets/${value.name}/versions/latest`;
+                }
+                else {
+                    newParams[key] = value;
+                }
+            }
+            finally {
+                _d = true;
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return newParams;
+}
+exports.substituteSecretParams = substituteSecretParams;
 function populateDefaultParams(paramVars, paramSpecs) {
     const newParams = paramVars;
     for (const param of paramSpecs) {
@@ -417,12 +454,12 @@ function validateReleaseNotes(rootDirectory, newVersion, extension) {
     catch (err) {
         throw new error_1.FirebaseError("No CHANGELOG.md file found. " +
             "Please create one and add an entry for this version. " +
-            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details."));
+            "See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details.");
     }
     if (!notes && !semver.prerelease(newVersion) && extension) {
         throw new error_1.FirebaseError(`No entry for version ${newVersion} found in CHANGELOG.md. ` +
             "Please add one so users know what has changed in this version. " +
-            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details."));
+            "See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details.");
     }
     return notes;
 }
@@ -474,7 +511,7 @@ function displayExtensionHeader(extensionRef, extension, extensionRoot) {
     }
     else {
         logger_1.logger.info(`\n${clc.bold("Extension:")} ${extensionRef}\n` +
-            `${clc.bold("State:")} ${clc.bold(clc.blue("New"))}\n`);
+            `${clc.bold("State:")} ${clc.bold(clc.blueBright("New"))}\n`);
     }
 }
 async function fetchExtensionSource(repoUri, sourceRef, extensionRoot) {
@@ -701,7 +738,7 @@ async function uploadExtensionVersionFromLocalSource(args) {
 }
 exports.uploadExtensionVersionFromLocalSource = uploadExtensionVersionFromLocalSource;
 function getMissingPublisherError(publisherId) {
-    return new error_1.FirebaseError((0, marked_1.marked)(`Couldn't find publisher ID '${clc.bold(publisherId)}'. Please ensure that you have registered this ID. For step-by-step instructions on getting started as a publisher, see https://firebase.google.com/docs/extensions/publishers/get-started.`));
+    return new error_1.FirebaseError(`Couldn't find publisher ID '${clc.bold(publisherId)}'. Please ensure that you have registered this ID. For step-by-step instructions on getting started as a publisher, see https://firebase.google.com/docs/extensions/publishers/get-started.`);
 }
 exports.getMissingPublisherError = getMissingPublisherError;
 async function createSourceFromLocation(projectId, sourceUri) {
@@ -796,7 +833,7 @@ async function instanceIdExists(projectId, instanceId) {
             if (err.status === 404) {
                 return false;
             }
-            const msg = `Unexpected error when checking if instance ID exists: ${err}`;
+            const msg = `Unexpected error when checking if instance ID exists: ${err.message}`;
             throw new error_1.FirebaseError(msg, {
                 original: err,
             });

package/lib/extensions/localHelper.js

@@ -38,7 +38,7 @@ function readFile(pathToFile) {
     }
     catch (err) {
         if (err.code === "ENOENT") {
-            throw new error_1.FirebaseError(`Could not find "${pathToFile}""`, { original: err });
+            throw new error_1.FirebaseError(`Could not find "${pathToFile}"`, { original: err });
         }
         throw new error_1.FirebaseError(`Failed to read file at "${pathToFile}"`, { original: err });
     }

package/lib/extensions/provisioningHelper.js

@@ -64,7 +64,7 @@ async function checkProducts(projectId, usedProducts) {
                     "without server-side code.\n";
             errorMessage += `   https://console.firebase.google.com/project/${projectId}/authentication/users`;
         }
-        throw new error_1.FirebaseError((0, marked_1.marked)(errorMessage), { exit: 2 });
+        throw new error_1.FirebaseError(await (0, marked_1.marked)(errorMessage), { exit: 2 });
     }
 }
 function getUsedProducts(spec) {

package/lib/extensions/refs.js

@@ -7,13 +7,16 @@ const refRegex = new RegExp(/^([^/@\n]+)\/{1}([^/@\n]+)(@{1}([^\n]+)|)$/);
 function parse(refOrName) {
     const ret = parseRef(refOrName) || parseName(refOrName);
     if (!ret || !ret.publisherId || !ret.extensionId) {
-        throw new error_1.FirebaseError(`Unable to parse ${refOrName} as an extension ref`);
+        throw new error_1.FirebaseError(`Unable to parse ${refOrName} as an extension ref.\n` +
+            "Expected format is either publisherId/extensionId@version or " +
+            "publishers/publisherId/extensions/extensionId/versions/version. If you " +
+            "are referring to a local extension directory, please ensure the directory exists.");
     }
     if (ret.version &&
         !semver.valid(ret.version) &&
         !semver.validRange(ret.version) &&
         !["latest", "latest-approved"].includes(ret.version)) {
-        throw new error_1.FirebaseError(`Extension reference ${ret} contains an invalid version ${ret.version}.`);
+        throw new error_1.FirebaseError(`Extension reference ${JSON.stringify(ret, null, 2)} contains an invalid version ${ret.version}.`);
     }
     return ret;
 }
@@ -21,19 +24,31 @@ exports.parse = parse;
 function parseRef(ref) {
     const parts = refRegex.exec(ref);
     if (parts && (parts.length === 5 || parts.length === 7)) {
-        const publisherId = parts[1];
-        const extensionId = parts[2];
-        const version = parts[4];
-        return { publisherId, extensionId, version };
+        return {
+            publisherId: parts[1],
+            extensionId: parts[2],
+            version: parts[4],
+        };
     }
 }
 function parseName(name) {
     const parts = name.split("/");
-    return {
-        publisherId: parts[1],
-        extensionId: parts[3],
-        version: parts[5],
-    };
+    if (parts[0] !== "publishers" || parts[2] !== "extensions") {
+        return;
+    }
+    if (parts.length === 4) {
+        return {
+            publisherId: parts[1],
+            extensionId: parts[3],
+        };
+    }
+    if (parts.length === 6 && parts[4] === "versions") {
+        return {
+            publisherId: parts[1],
+            extensionId: parts[3],
+            version: parts[5],
+        };
+    }
 }
 function toExtensionRef(ref) {
     return `${ref.publisherId}/${ref.extensionId}`;

package/lib/extensions/runtimes/common.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractExtensionsFromBuilds = exports.extractAllDynamicExtensions = void 0;
+const projectConfig_1 = require("../../functions/projectConfig");
+const prepare_1 = require("../../deploy/functions/prepare");
+const functionsConfig_1 = require("../../functionsConfig");
+const functionsDeployHelper_1 = require("../../deploy/functions/functionsDeployHelper");
+const logger_1 = require("../../logger");
+const savedLoggerSilent = logger_1.logger.silent;
+function silenceLogging() {
+    logger_1.logger.silent = true;
+}
+function resumeLogging() {
+    logger_1.logger.silent = savedLoggerSilent;
+}
+async function extractAllDynamicExtensions(options) {
+    const firebaseConfig = await (0, functionsConfig_1.getFirebaseConfig)(options);
+    const runtimeConfig = { firebase: firebaseConfig };
+    const functionsConfig = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
+    let functionsBuilds = {};
+    const codebases = (0, functionsDeployHelper_1.targetCodebases)(functionsConfig);
+    silenceLogging();
+    for (const codebase of codebases) {
+        try {
+            const filters = [{ codebase: `${codebase}` }];
+            const builds = await (0, prepare_1.loadCodebases)(functionsConfig, options, firebaseConfig, runtimeConfig, filters);
+            functionsBuilds = Object.assign(Object.assign({}, functionsBuilds), builds);
+        }
+        catch (err) {
+        }
+    }
+    resumeLogging();
+    return extractExtensionsFromBuilds(functionsBuilds);
+}
+exports.extractAllDynamicExtensions = extractAllDynamicExtensions;
+function extractExtensionsFromBuilds(builds, filters) {
+    const extRecords = {};
+    for (const [codebase, build] of Object.entries(builds)) {
+        if (build.extensions) {
+            for (const [id, ext] of Object.entries(build.extensions)) {
+                if (extensionMatchesAnyFilter(codebase, id, filters)) {
+                    extRecords[id] = ext;
+                }
+            }
+        }
+    }
+    return extRecords;
+}
+exports.extractExtensionsFromBuilds = extractExtensionsFromBuilds;
+function extensionMatchesAnyFilter(codebase, extensionId, filters) {
+    if (!filters) {
+        return true;
+    }
+    return filters.some((f) => extensionMatchesFilter(codebase, extensionId, f));
+}
+function extensionMatchesFilter(codebase, extensionId, filter) {
+    if (codebase && filter.codebase) {
+        if (codebase !== filter.codebase) {
+            return false;
+        }
+    }
+    if (!filter.idChunks) {
+        return true;
+    }
+    const idChunks = extensionId.split("-");
+    if (idChunks.length < filter.idChunks.length) {
+        return false;
+    }
+    for (let i = 0; i < filter.idChunks.length; i++) {
+        if (idChunks[i] !== filter.idChunks[i]) {
+            return false;
+        }
+    }
+    return true;
+}

package/lib/extensions/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
+exports.isExtensionSpec = exports.isResource = exports.isParam = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
 var RegistryLaunchStage;
 (function (RegistryLaunchStage) {
     RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
@@ -21,5 +21,60 @@ var ParamType;
     ParamType["STRING"] = "STRING";
     ParamType["SELECT"] = "SELECT";
     ParamType["MULTISELECT"] = "MULTISELECT";
+    ParamType["SELECT_RESOURCE"] = "SELECT_RESOURCE";
     ParamType["SECRET"] = "SECRET";
 })(ParamType = exports.ParamType || (exports.ParamType = {}));
+function isObject(value) {
+    return typeof value === "object" && value !== null;
+}
+const isParam = (param) => {
+    return (isObject(param) && typeof param["param"] === "string" && typeof param["label"] === "string");
+};
+exports.isParam = isParam;
+const isResource = (res) => {
+    return isObject(res) && typeof res["name"] === "string";
+};
+exports.isResource = isResource;
+const isExtensionSpec = (spec) => {
+    if (!isObject(spec) || typeof spec.name !== "string" || typeof spec.version !== "string") {
+        return false;
+    }
+    let validResources = true;
+    if (spec.resources && Array.isArray(spec.resources)) {
+        for (const res of spec.resources) {
+            validResources = validResources && (0, exports.isResource)(res);
+            if (!validResources) {
+                break;
+            }
+        }
+    }
+    else {
+        return false;
+    }
+    let validParams = true;
+    if (spec.params && Array.isArray(spec.params)) {
+        for (const param of spec.params) {
+            validParams = validParams && (0, exports.isParam)(param);
+            if (!validParams) {
+                break;
+            }
+        }
+    }
+    else {
+        return false;
+    }
+    let validSysParams = true;
+    if (spec.systemParams && Array.isArray(spec.systemParams)) {
+        for (const param of spec.systemParams) {
+            validSysParams = validSysParams && (0, exports.isParam)(param);
+            if (!validSysParams) {
+                break;
+            }
+        }
+    }
+    else {
+        return false;
+    }
+    return true;
+};
+exports.isExtensionSpec = isExtensionSpec;

package/lib/extensions/updateHelper.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inferUpdateSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
 const clc = require("colorette");
 const semver = require("semver");
-const marked_1 = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const extensionsApi = require("./extensionsApi");
@@ -47,7 +46,7 @@ function warningUpdateToOtherSource(sourceOrigin) {
         targetText = "URL";
     }
     const warning = `All the instance's resources and logic will be overwritten to use the source code and files from the ${targetText}.\n`;
-    logger_1.logger.info((0, marked_1.marked)(warning));
+    logger_1.logger.info(warning);
 }
 exports.warningUpdateToOtherSource = warningUpdateToOtherSource;
 async function update(updateOptions) {

package/lib/extensions/warnings.js

@@ -2,11 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.outOfBandChangesWarning = exports.displayWarningsForDeploy = void 0;
 const clc = require("colorette");
-const TerminalRenderer = require("marked-terminal");
-const marked_1 = require("marked");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 const extensionsHelper_1 = require("./extensionsHelper");
 const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
 const planner_1 = require("../deploy/extensions/planner");
@@ -29,9 +24,9 @@ async function displayWarningsForDeploy(instancesToCreate) {
     const unpublishedExtensions = uploadedExtensionInstances.filter((i) => { var _a, _b; return ((_b = (_a = i.extensionVersion) === null || _a === void 0 ? void 0 : _a.listing) === null || _b === void 0 ? void 0 : _b.state) !== "APPROVED"; });
     if (unpublishedExtensions.length) {
         const humanReadableList = unpublishedExtensions.map(toListEntry).join("\n");
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`The following extension versions have not been published to the Firebase Extensions Hub:\n${humanReadableList}\n.` +
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `The following extension versions have not been published to the Firebase Extensions Hub:\n${humanReadableList}\n.` +
             "Unpublished extensions have not been reviewed by " +
-            "Firebase. Please make sure you trust the extension publisher before installing this extension.", { gfm: false }));
+            "Firebase. Please make sure you trust the extension publisher before installing this extension.");
     }
     return unpublishedExtensions.length > 0;
 }

package/lib/firestore/api.js

@@ -420,15 +420,16 @@ class FirestoreApi {
         }
         return database;
     }
-    async createDatabase(project, databaseId, locationId, type, deleteProtectionState, pointInTimeRecoveryEnablement) {
-        const url = `/projects/${project}/databases`;
+    async createDatabase(req) {
+        const url = `/projects/${req.project}/databases`;
         const payload = {
-            type,
-            locationId,
-            deleteProtectionState,
-            pointInTimeRecoveryEnablement,
+            locationId: req.locationId,
+            type: req.type,
+            deleteProtectionState: req.deleteProtectionState,
+            pointInTimeRecoveryEnablement: req.pointInTimeRecoveryEnablement,
+            cmekConfig: req.cmekConfig,
         };
-        const options = { queryParams: { databaseId: databaseId } };
+        const options = { queryParams: { databaseId: req.databaseId } };
         const res = await this.apiClient.post(url, payload, options);
         const database = res.body.response;
         if (!database) {

package/lib/firestore/pretty-print.js

@@ -33,13 +33,33 @@ class PrettyPrint {
         logger_1.logger.info(table.toString());
     }
     prettyPrintDatabase(database) {
+        let colValueWidth = Math.max(50, 5 + database.name.length);
+        if (database.cmekConfig) {
+            colValueWidth = Math.max(140, 20 + database.cmekConfig.kmsKeyName.length);
+        }
         const table = new Table({
             head: ["Field", "Value"],
-            colWidths: [25, Math.max(50, 5 + database.name.length)],
+            colWidths: [30, colValueWidth],
         });
         table.push(["Name", clc.yellow(database.name)], ["Create Time", clc.yellow(database.createTime)], ["Last Update Time", clc.yellow(database.updateTime)], ["Type", clc.yellow(database.type)], ["Location", clc.yellow(database.locationId)], ["Delete Protection State", clc.yellow(database.deleteProtectionState)], ["Point In Time Recovery", clc.yellow(database.pointInTimeRecoveryEnablement)], ["Earliest Version Time", clc.yellow(database.earliestVersionTime)], ["Version Retention Period", clc.yellow(database.versionRetentionPeriod)]);
+        if (database.cmekConfig) {
+            table.push(["KMS Key Name", clc.yellow(database.cmekConfig.kmsKeyName)]);
+            if (database.cmekConfig.activeKeyVersion) {
+                table.push([
+                    "Active Key Versions",
+                    clc.yellow(this.prettyStringArray(database.cmekConfig.activeKeyVersion)),
+                ]);
+            }
+        }
         logger_1.logger.info(table.toString());
     }
+    prettyStringArray(stringArray) {
+        let result = "";
+        stringArray.forEach((str) => {
+            result += `${str}\n`;
+        });
+        return result;
+    }
     prettyPrintBackups(backups) {
         if (backups.length === 0) {
             logger_1.logger.info("No backups found.");

package/lib/firestore/pretty-print.test.js

@@ -51,3 +51,11 @@ describe("firebaseConsoleDatabaseUrl", () => {
         (0, chai_1.expect)(printer.firebaseConsoleDatabaseUrl("example-project", "(default)")).to.equal("https://console.firebase.google.com/project/example-project/firestore/databases/-default-/data");
     });
 });
+describe("prettyStringArray", () => {
+    it("should correctly print an array of strings", () => {
+        (0, chai_1.expect)(printer.prettyStringArray(["kms-key-1", "kms-key-2"])).to.equal("kms-key-1\nkms-key-2\n");
+    });
+    it("should print nothing if the array is empty", () => {
+        (0, chai_1.expect)(printer.prettyStringArray([])).to.equal("");
+    });
+});

package/lib/frameworks/constants.js

@@ -20,7 +20,7 @@ exports.FIREBASE_FRAMEWORKS_VERSION = (experiments.isEnabled("internaltesting")
     DEFAULT_FIREBASE_FRAMEWORKS_VERSION;
 exports.FIREBASE_FUNCTIONS_VERSION = "^4.5.0";
 exports.FIREBASE_ADMIN_VERSION = "^11.11.1";
-exports.SHARP_VERSION = "^0.32.1";
+exports.SHARP_VERSION = "^0.32 || ^0.33";
 exports.NODE_VERSION = parseInt(process.versions.node, 10);
 exports.VALID_ENGINES = { node: [16, 18, 20] };
 exports.VALID_LOCALE_FORMATS = [/^ALL_[a-z]+$/, /^[a-z]+_ALL$/, /^[a-z]+(_[a-z]+)?$/];

package/lib/frameworks/next/constants.js

@@ -11,7 +11,7 @@ exports.ROUTES_MANIFEST = "routes-manifest.json";
 exports.APP_PATHS_MANIFEST = "app-paths-manifest.json";
 exports.SERVER_REFERENCE_MANIFEST = "server-reference-manifest.json";
 exports.CONFIG_FILES = ["next.config.js", "next.config.mjs"];
-exports.ESBUILD_VERSION = "0.19.2";
+exports.ESBUILD_VERSION = "^0.19.2";
 const WEBPACK_LAYERS_NAMES = {
     shared: "shared",
     reactServerComponents: "rsc",

package/lib/frameworks/next/index.js

@@ -29,7 +29,6 @@ exports.name = "Next.js";
 exports.support = "preview";
 exports.type = 2;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/nextjs";
-const BUNDLE_NEXT_CONFIG_TIMEOUT = 60000;
 const DEFAULT_NUMBER_OF_REASONS_TO_LIST = 5;
 function getReactVersion(cwd) {
     var _a;
@@ -338,6 +337,19 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
     const configFile = await (0, utils_2.whichNextConfigFile)(sourceDir);
     if (configFile) {
         try {
+            let esbuildPath = (0, utils_2.findEsbuildPath)();
+            if (!esbuildPath || !(0, fs_extra_1.pathExistsSync)(esbuildPath)) {
+                console.warn("esbuild not found, installing...");
+                (0, utils_2.installEsbuild)(constants_2.ESBUILD_VERSION);
+                esbuildPath = (0, utils_2.findEsbuildPath)();
+                if (!esbuildPath || !(0, fs_extra_1.pathExistsSync)(esbuildPath)) {
+                    throw new error_1.FirebaseError("Failed to locate esbuild after installation.");
+                }
+            }
+            const esbuild = require(esbuildPath);
+            if (!esbuild) {
+                throw new error_1.FirebaseError(`Failed to load esbuild from path: ${esbuildPath}`);
+            }
             const productionDeps = await new Promise((resolve) => {
                 const dependencies = [];
                 const npmLs = (0, cross_spawn_1.spawn)("npm", ["ls", "--omit=dev", "--all", "--json=true"], {
@@ -359,21 +371,21 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
                     resolve([...new Set(dependencies)]);
                 });
             });
-            const esbuildArgs = productionDeps
-                .map((it) => `--external:${it}`)
-                .concat("--bundle", "--platform=node", `--target=node${constants_1.NODE_VERSION}`, "--log-level=error");
+            const esbuildArgs = {
+                entryPoints: [(0, path_1.join)(sourceDir, configFile)],
+                outfile: (0, path_1.join)(destDir, configFile),
+                bundle: true,
+                platform: "node",
+                target: `node${constants_1.NODE_VERSION}`,
+                logLevel: "error",
+                external: productionDeps,
+            };
             if (configFile === "next.config.mjs") {
-                esbuildArgs.push(...[`--outfile=${(0, path_1.join)(destDir, configFile)}`, "--format=esm"]);
+                esbuildArgs.format = "esm";
             }
-            else {
-                esbuildArgs.push(`--outfile=${(0, path_1.join)(destDir, configFile)}`);
-            }
-            const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", `esbuild@${constants_2.ESBUILD_VERSION}`, configFile, ...esbuildArgs], {
-                cwd: sourceDir,
-                timeout: BUNDLE_NEXT_CONFIG_TIMEOUT,
-            });
-            if (bundle.status !== 0) {
-                throw new error_1.FirebaseError(bundle.stderr.toString());
+            const bundle = await esbuild.build(esbuildArgs);
+            if (bundle.errors && bundle.errors.length > 0) {
+                throw new error_1.FirebaseError(bundle.errors.toString());
             }
         }
         catch (e) {

package/lib/frameworks/next/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.whichNextConfigFile = exports.getProductionDistDirFiles = exports.getRoutesWithServerAction = exports.hasStaticAppNotFoundComponent = 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;
+exports.installEsbuild = exports.getGlobalEsbuildVersion = exports.findEsbuildPath = exports.whichNextConfigFile = exports.getProductionDistDirFiles = exports.getRoutesWithServerAction = exports.hasStaticAppNotFoundComponent = 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");
@@ -11,6 +11,8 @@ const utils_1 = require("../utils");
 const constants_1 = require("./constants");
 const fsutils_1 = require("../../fsutils");
 const utils_2 = require("../../utils");
+const child_process_1 = require("child_process");
+const error_1 = require("../../error");
 exports.I18N_SOURCE = /\/:nextInternalLocale(\([^\)]+\))?/;
 function cleanEscapedChars(path) {
     return path.replace(/\\([(){}:+?*])/g, (a, b) => b);
@@ -241,3 +243,45 @@ async function whichNextConfigFile(dir) {
     return null;
 }
 exports.whichNextConfigFile = whichNextConfigFile;
+function findEsbuildPath() {
+    try {
+        const esbuildBinPath = (0, child_process_1.execSync)("npx which esbuild", { encoding: "utf8" }).trim();
+        const globalVersion = getGlobalEsbuildVersion();
+        if (globalVersion && !(0, semver_1.satisfies)(globalVersion, constants_1.ESBUILD_VERSION)) {
+            console.warn(`Warning: Global esbuild version (${globalVersion}) does not match the required version (${constants_1.ESBUILD_VERSION}).`);
+        }
+        return (0, path_1.resolve)((0, path_1.dirname)(esbuildBinPath), "../esbuild");
+    }
+    catch (error) {
+        console.error(`Failed to find esbuild with npx which: ${error}`);
+        return null;
+    }
+}
+exports.findEsbuildPath = findEsbuildPath;
+function getGlobalEsbuildVersion() {
+    try {
+        const versionOutput = (0, child_process_1.execSync)("esbuild --version", { encoding: "utf8" }).trim();
+        const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+)/);
+        return versionMatch ? versionMatch[0] : null;
+    }
+    catch (error) {
+        console.error(`Failed to get global esbuild version: ${error}`);
+        return null;
+    }
+}
+exports.getGlobalEsbuildVersion = getGlobalEsbuildVersion;
+function installEsbuild(version) {
+    const installCommand = `npm install esbuild@${version} --no-save`;
+    try {
+        (0, child_process_1.execSync)(installCommand, { stdio: "inherit" });
+    }
+    catch (error) {
+        if (error instanceof error_1.FirebaseError) {
+            throw error;
+        }
+        else {
+            throw new error_1.FirebaseError(`Failed to install esbuild: ${error}`, { original: error });
+        }
+    }
+}
+exports.installEsbuild = installEsbuild;