firebase-tools 13.15.0 → 13.15.1

package/lib/extensions/askUserForEventsConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askForEventArcLocation = exports.askShouldCollectEventsConfig = exports.askForAllowedEventTypes = exports.askForEventsConfig = exports.checkAllowedEventTypesResponse = void 0;
+exports.askForEventArcLocation = exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION = exports.ALLOWED_EVENT_ARC_REGIONS = exports.askShouldCollectEventsConfig = exports.askForAllowedEventTypes = exports.getEventArcChannel = exports.askForEventsConfig = exports.checkAllowedEventTypesResponse = void 0;
 const prompt_1 = require("../prompt");
 const extensionsApi = require("../extensions/extensionsApi");
 const utils = require("../utils");
@@ -23,7 +23,7 @@ function checkAllowedEventTypesResponse(response, validEvents) {
 exports.checkAllowedEventTypesResponse = checkAllowedEventTypesResponse;
 async function askForEventsConfig(events, projectId, instanceId) {
     var _a, _b;
-    logger_1.logger.info(`\n${clc.bold("Enable Events")}: ${(0, marked_1.marked)("If you enable events, you can write custom event handlers ([https://firebase.google.com/docs/extensions/install-extensions#eventarc](https://firebase.google.com/docs/extensions/install-extensions#eventarc)) that respond to these events.\n\nYou can always enable or disable events later. Events will be emitted via Eventarc. Fees apply ([https://cloud.google.com/eventarc/pricing](https://cloud.google.com/eventarc/pricing)).")}`);
+    logger_1.logger.info(`\n${clc.bold("Enable Events")}: ${await (0, marked_1.marked)("If you enable events, you can write custom event handlers ([https://firebase.google.com/docs/extensions/install-extensions#eventarc](https://firebase.google.com/docs/extensions/install-extensions#eventarc)) that respond to these events.\n\nYou can always enable or disable events later. Events will be emitted via Eventarc. Fees apply ([https://cloud.google.com/eventarc/pricing](https://cloud.google.com/eventarc/pricing)).")}`);
     if (!(await askShouldCollectEventsConfig())) {
         return undefined;
     }
@@ -38,11 +38,15 @@ async function askForEventsConfig(events, projectId, instanceId) {
     const preselectedTypes = (_a = existingInstance === null || existingInstance === void 0 ? void 0 : existingInstance.config.allowedEventTypes) !== null && _a !== void 0 ? _a : [];
     const oldLocation = (_b = existingInstance === null || existingInstance === void 0 ? void 0 : existingInstance.config.eventarcChannel) === null || _b === void 0 ? void 0 : _b.split("/")[3];
     const location = await askForEventArcLocation(oldLocation);
-    const channel = `projects/${projectId}/locations/${location}/channels/firebase`;
+    const channel = getEventArcChannel(projectId, location);
     const allowedEventTypes = await askForAllowedEventTypes(events, preselectedTypes);
     return { channel, allowedEventTypes };
 }
 exports.askForEventsConfig = askForEventsConfig;
+function getEventArcChannel(projectId, location) {
+    return `projects/${projectId}/locations/${location}/channels/firebase`;
+}
+exports.getEventArcChannel = getEventArcChannel;
 async function askForAllowedEventTypes(eventDescriptors, preselectedTypes) {
     let valid = false;
     let response = [];
@@ -75,21 +79,27 @@ async function askShouldCollectEventsConfig() {
     });
 }
 exports.askShouldCollectEventsConfig = askShouldCollectEventsConfig;
+exports.ALLOWED_EVENT_ARC_REGIONS = [
+    "us-central1",
+    "us-west1",
+    "europe-west4",
+    "asia-northeast1",
+];
+exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION = "us-central1";
 async function askForEventArcLocation(preselectedLocation) {
     let valid = false;
-    const allowedRegions = ["us-central1", "us-west1", "europe-west4", "asia-northeast1"];
     let location = "";
     while (!valid) {
         location = await (0, prompt_1.promptOnce)({
             name: "input",
             type: "list",
-            default: preselectedLocation !== null && preselectedLocation !== void 0 ? preselectedLocation : "us-central1",
+            default: preselectedLocation !== null && preselectedLocation !== void 0 ? preselectedLocation : exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION,
             message: "Which location would you like the Eventarc channel to live in? We recommend using the default option. A channel location that differs from the extension's Cloud Functions location can incur egress cost.",
-            choices: allowedRegions.map((e) => ({ checked: false, value: e })),
+            choices: exports.ALLOWED_EVENT_ARC_REGIONS.map((e) => ({ checked: false, value: e })),
         });
-        valid = allowedRegions.includes(location);
+        valid = exports.ALLOWED_EVENT_ARC_REGIONS.includes(location);
         if (!valid) {
-            utils.logWarning(`Unexpected EventArc region '${location}' was specified. Allowed regions: ${allowedRegions.join(", ")}`);
+            utils.logWarning(`Unexpected EventArc region '${location}' was specified. Allowed regions: ${exports.ALLOWED_EVENT_ARC_REGIONS.join(", ")}`);
         }
     }
     return location;

package/lib/extensions/askUserForParam.js

@@ -255,7 +255,7 @@ async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
         ],
     });
     switch (action) {
-        case SecretUpdateAction.SET_NEW:
+        case SecretUpdateAction.SET_NEW: {
             let secret;
             let secretName;
             if (paramSpec.default) {
@@ -288,6 +288,7 @@ async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
             else {
                 return "";
             }
+        }
         case SecretUpdateAction.LEAVE:
         default:
             return paramSpec.default || "";

package/lib/extensions/displayExtensionInfo.js

@@ -50,7 +50,7 @@ async function displayExtensionVersionInfo(args) {
         if (extensionVersion.buildSourceUri) {
             const buildSourceUri = new URL(extensionVersion.buildSourceUri);
             buildSourceUri.pathname = path.join(buildSourceUri.pathname, (_c = extensionVersion.extensionRoot) !== null && _c !== void 0 ? _c : "");
-            lines.push(`${clc.bold("Source in GitHub:")} ${buildSourceUri}`);
+            lines.push(`${clc.bold("Source in GitHub:")} ${buildSourceUri.toString()}`);
         }
         else {
             lines.push(`${clc.bold("Source download URI:")} ${(_d = extensionVersion.sourceDownloadUri) !== null && _d !== void 0 ? _d : "-"}`);
@@ -105,24 +105,24 @@ function displayResources(spec) {
                 break;
             default:
         }
-        return `  - ${clc.blue(`${resource.name} (${type})`)}${resource.description ? `: ${resource.description}` : ""}`;
+        return `  - ${clc.blueBright(`${resource.name} (${type})`)}${resource.description ? `: ${resource.description}` : ""}`;
     });
     lines.push(...new Set((_a = spec.lifecycleEvents) === null || _a === void 0 ? void 0 : _a.map((event) => {
-        return `  - ${clc.blue(`${event.taskQueueTriggerFunction} (Cloud Task queue)`)}`;
+        return `  - ${clc.blueBright(`${event.taskQueueTriggerFunction} (Cloud Task queue)`)}`;
     })));
     lines.push(...spec.params
         .filter((param) => {
         return param.type === "SECRET";
     })
         .map((param) => {
-        return `  - ${clc.blue(`${param.param} (Cloud Secret Manager secret)`)}`;
+        return `  - ${clc.blueBright(`${param.param} (Cloud Secret Manager secret)`)}`;
     }));
     return clc.bold("Resources created:\n") + (lines.length ? lines.join("\n") : " - None");
 }
 exports.displayResources = displayResources;
 async function retrieveRoleInfo(role) {
     const res = await iam.getRole(role);
-    return `  - ${clc.yellow(res.title)}${res.description ? `: ${res.description}` : ""}`;
+    return `  - ${clc.yellow(res.title || res.name)}${res.description ? `: ${res.description}` : ""}`;
 }
 exports.retrieveRoleInfo = retrieveRoleInfo;
 async function displayRoles(roles) {

package/lib/extensions/extensionsApi.js

@@ -356,6 +356,6 @@ function refNotFoundError(ref) {
     return new error_1.FirebaseError(`The extension reference '${clc.bold(ref.version ? refs.toExtensionVersionRef(ref) : refs.toExtensionRef(ref))}' doesn't exist. This could happen for two reasons:\n` +
         `  -The publisher ID '${clc.bold(ref.publisherId)}' doesn't exist or could be misspelled\n` +
         `  -The name of the ${ref.version ? "extension version" : "extension"} '${clc.bold(ref.version ? `${ref.extensionId}@${ref.version}` : ref.extensionId)}' doesn't exist or could be misspelled\n\n` +
-        `Please correct the extension reference and try again. If you meant to install an extension from a local source, please provide a relative path prefixed with '${clc.bold("./")}', '${clc.bold("../")}', or '${clc.bold("~/")}'.}`, { status: 404 });
+        `Please correct the extension reference and try again. If you meant to reference an extension from a local source, please provide a relative path prefixed with '${clc.bold("./")}', '${clc.bold("../")}', or '${clc.bold("~/")}'.}`, { status: 404 });
 }
 exports.refNotFoundError = refNotFoundError;

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");
@@ -126,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) {
@@ -472,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) {
@@ -794,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/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/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;

package/lib/init/features/dataconnect/index.js

@@ -21,6 +21,7 @@ const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/que
 const MUTATIONS_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/mutations.gql");
 const defaultConnector = {
     id: "default",
+    path: "./connector",
     files: [
         {
             path: "queries.gql",
@@ -92,7 +93,7 @@ exports.actuate = actuate;
 async function writeFiles(config, info) {
     const dir = config.get("dataconnect.source") || "dataconnect";
     console.log(dir);
-    const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorIds: info.connectors.map((c) => `"./${c.id}"`).join(", ") }));
+    const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: info.connectors.map((c) => c.path) }));
     config.set("dataconnect", { source: dir });
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
     if (info.schemaGql.length) {
@@ -111,9 +112,9 @@ async function writeFiles(config, info) {
 async function writeConnectorFiles(config, connectorInfo) {
     const subbedConnectorYaml = subConnectorYamlValues({ connectorId: connectorInfo.id });
     const dir = config.get("dataconnect.source") || "dataconnect";
-    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.id, "connector.yaml"), subbedConnectorYaml);
+    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, "connector.yaml"), subbedConnectorYaml);
     for (const f of connectorInfo.files) {
-        await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.id, f.path), f.content);
+        await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, f.path), f.content);
     }
 }
 function subDataconnectYamlValues(replacementValues) {
@@ -121,12 +122,12 @@ function subDataconnectYamlValues(replacementValues) {
         serviceId: "__serviceId__",
         cloudSqlDatabase: "__cloudSqlDatabase__",
         cloudSqlInstanceId: "__cloudSqlInstanceId__",
-        connectorIds: "__connectorIds__",
+        connectorDirs: "__connectorDirs__",
         locationId: "__location__",
     };
     let replaced = DATACONNECT_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
-        replaced = replaced.replace(replacements[k], v);
+        replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }
     return replaced;
 }
@@ -136,7 +137,7 @@ function subConnectorYamlValues(replacementValues) {
     };
     let replaced = CONNECTOR_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
-        replaced = replaced.replace(replacements[k], v);
+        replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }
     return replaced;
 }
@@ -181,8 +182,10 @@ async function promptForService(setup, info) {
                     const connectors = await (0, client_1.listConnectors)(choice.service.name);
                     if (connectors.length) {
                         info.connectors = connectors.map((c) => {
+                            const id = c.name.split("/").pop();
                             return {
-                                id: c.name.split("/").pop(),
+                                id,
+                                path: `./${id}`,
                                 files: c.source.files || [],
                             };
                         });