firebase-tools 11.21.0 → 11.23.0

package/lib/extensions/change-log.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseChangelog = exports.getLocalChangelog = exports.breakingChangesInUpdate = exports.displayReleaseNotes = exports.getReleaseNotesForUpdate = void 0;
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const path = require("path");
 const semver = require("semver");
 const TerminalRenderer = require("marked-terminal");
@@ -12,7 +12,7 @@ const localHelper_1 = require("./localHelper");
 const logger_1 = require("../logger");
 const refs = require("./refs");
 const utils_1 = require("../utils");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const EXTENSIONS_CHANGELOG = "CHANGELOG.md";
@@ -39,10 +39,10 @@ function displayReleaseNotes(releaseNotes, fromVersion) {
     const table = new Table({ head: ["Version", "What's New"], style: { head: ["yellow", "bold"] } });
     for (const [version, note] of Object.entries(releaseNotes)) {
         if (breakingVersions.includes(version)) {
-            table.push([clc.yellow(clc.bold(version)), marked(note)]);
+            table.push([clc.yellow(clc.bold(version)), (0, marked_1.marked)(note)]);
         }
         else {
-            table.push([version, marked(note)]);
+            table.push([version, (0, marked_1.marked)(note)]);
         }
     }
     logger_1.logger.info(clc.bold("What's new with this update:"));

package/lib/extensions/displayExtensionInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrieveRoleInfo = exports.printSourceDownloadLink = exports.displayExtInfo = void 0;
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const utils = require("../utils");
 const extensionsHelper_1 = require("./extensionsHelper");
@@ -11,7 +11,7 @@ const error_1 = require("../error");
 const types_1 = require("./types");
 const iam = require("../gcp/iam");
 const secretsUtils_1 = require("./secretsUtils");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const TASKS_ROLE = "cloudtasks.enqueuer";
@@ -44,7 +44,7 @@ async function displayExtInfo(extensionName, publisher, spec, published = false)
     if (lines.length > 0) {
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, `information about '${clc.bold(extensionName)}':`);
         const infoStr = lines.join("\n");
-        const formatted = marked(infoStr).replace(/\n+$/, "\n");
+        const formatted = (0, marked_1.marked)(infoStr).replace(/\n+$/, "\n");
         logger_1.logger.info(formatted);
         return lines;
     }
@@ -60,7 +60,7 @@ async function displayExtInfo(extensionName, publisher, spec, published = false)
 exports.displayExtInfo = displayExtInfo;
 function printSourceDownloadLink(sourceDownloadUri) {
     const sourceDownloadMsg = `Want to review the source code that will be installed? Download it here: ${sourceDownloadUri}`;
-    utils.logBullet(marked(sourceDownloadMsg));
+    utils.logBullet((0, marked_1.marked)(sourceDownloadMsg));
 }
 exports.printSourceDownloadLink = printSourceDownloadLink;
 async function retrieveRoleInfo(role) {

package/lib/extensions/emulator/optionsHelper.js

@@ -32,7 +32,7 @@ async function buildOptions(options) {
     options.extDevEnv = params;
     const functionEmuTriggerDefs = functionResources.map((r) => triggerHelper.functionResourceToEmulatedTriggerDefintion(r));
     options.extDevTriggers = functionEmuTriggerDefs;
-    options.extDevNodeVersion = specHelper.getNodeVersion(functionResources);
+    options.extDevRuntime = specHelper.getRuntime(functionResources);
     return options;
 }
 exports.buildOptions = buildOptions;
@@ -45,12 +45,12 @@ async function getExtensionFunctionInfo(instance, paramValues) {
         trigger.name = `ext-${instance.instanceId}-${trigger.name}`;
         return trigger;
     });
-    const nodeMajorVersion = specHelper.getNodeVersion(functionResources);
+    const runtime = specHelper.getRuntime(functionResources);
     const nonSecretEnv = getNonSecretEnv(spec.params, paramValues);
     const secretEnvVariables = getSecretEnvVars(spec.params, paramValues);
     return {
         extensionTriggers,
-        nodeMajorVersion,
+        runtime,
         nonSecretEnv,
         secretEnvVariables,
     };

package/lib/extensions/emulator/specHelper.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readPostinstall = exports.readExtensionYaml = void 0;
+exports.getRuntime = exports.DEFAULT_RUNTIME = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readPostinstall = exports.readExtensionYaml = void 0;
 const yaml = require("js-yaml");
 const path = require("path");
 const fs = require("fs-extra");
 const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
 const utils_1 = require("../utils");
-const functionsEmulatorUtils_1 = require("../../emulator/functionsEmulatorUtils");
 const SPEC_FILE = "extension.yaml";
 const POSTINSTALL_FILE = "POSTINSTALL.md";
 const validFunctionTypes = [
@@ -67,24 +66,26 @@ function getFunctionProperties(resources) {
     return resources.map((r) => r.properties);
 }
 exports.getFunctionProperties = getFunctionProperties;
-function getNodeVersion(resources) {
+exports.DEFAULT_RUNTIME = "nodejs14";
+function getRuntime(resources) {
+    if (resources.length === 0) {
+        return exports.DEFAULT_RUNTIME;
+    }
     const invalidRuntimes = [];
-    const versions = resources.map((r) => {
-        if ((0, utils_1.getResourceRuntime)(r)) {
-            const runtimeName = (0, utils_1.getResourceRuntime)(r);
-            const runtime = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(runtimeName);
-            if (!runtime) {
-                invalidRuntimes.push(runtimeName);
-            }
-            else {
-                return runtime;
-            }
+    const runtimes = resources.map((r) => {
+        const runtime = (0, utils_1.getResourceRuntime)(r);
+        if (!runtime) {
+            return exports.DEFAULT_RUNTIME;
+        }
+        if (!/^(nodejs)?([0-9]+)/.test(runtime)) {
+            invalidRuntimes.push(runtime);
+            return exports.DEFAULT_RUNTIME;
         }
-        return 14;
+        return runtime;
     });
     if (invalidRuntimes.length) {
         throw new error_1.FirebaseError(`The following runtimes are not supported by the Emulator Suite: ${invalidRuntimes.join(", ")}. \n Only Node runtimes are supported.`);
     }
-    return Math.max(...versions);
+    return runtimes.sort()[runtimes.length - 1];
 }
-exports.getNodeVersion = getNodeVersion;
+exports.getRuntime = getRuntime;

package/lib/extensions/extensionsApi.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtension = exports.deleteExtension = exports.unpublishExtension = exports.publishExtensionVersion = exports.undeprecateExtensionVersion = exports.deprecateExtensionVersion = exports.registerPublisherProfile = exports.getPublisherProfile = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = void 0;
 const yaml = require("js-yaml");
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const error_1 = require("../error");
@@ -478,5 +478,5 @@ 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("~/")}'. Learn more about local extension installation at ${marked("[https://firebase.google.com/docs/extensions/alpha/install-extensions_community#install](https://firebase.google.com/docs/extensions/alpha/install-extensions_community#install).")}`, { status: 404 });
+        `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("~/")}'. Learn more about local extension installation at ${(0, marked_1.marked)("[https://firebase.google.com/docs/extensions/alpha/install-extensions_community#install](https://firebase.google.com/docs/extensions/alpha/install-extensions_community#install).")}`, { status: 404 });
 }

package/lib/extensions/extensionsHelper.js

@@ -4,9 +4,9 @@ exports.canonicalizeRefInput = exports.diagnoseAndFixProject = exports.confirm =
 const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const api_1 = require("../api");
@@ -329,12 +329,12 @@ async function publishExtensionVersionFromLocalSource(args) {
     catch (err) {
         throw new error_1.FirebaseError("No CHANGELOG.md file found. " +
             "Please create one and add an entry for this version. " +
-            marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
+            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
     }
     if (!notes && !semver.prerelease(extensionSpec.version) && extension) {
         throw new error_1.FirebaseError(`No entry for version ${extensionSpec.version} found in CHANGELOG.md. ` +
             "Please add one so users know what has changed in this version. " +
-            marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
+            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
     }
     displayReleaseNotes(args.publisherId, args.extensionId, extensionSpec.version, notes);
     if (!(await confirm({
@@ -380,7 +380,7 @@ async function publishExtensionVersionFromLocalSource(args) {
     catch (err) {
         publishSpinner.fail();
         if (err.status === 404) {
-            throw new error_1.FirebaseError(marked(`Couldn't find publisher ID '${clc.bold(args.publisherId)}'. Please ensure that you have registered this ID. To register as a publisher, you can check out the [Firebase documentation](https://firebase.google.com/docs/extensions/alpha/share#register_as_an_extensions_publisher) for step-by-step instructions.`));
+            throw new error_1.FirebaseError((0, marked_1.marked)(`Couldn't find publisher ID '${clc.bold(args.publisherId)}'. Please ensure that you have registered this ID. To register as a publisher, you can check out the [Firebase documentation](https://firebase.google.com/docs/extensions/alpha/share#register_as_an_extensions_publisher) for step-by-step instructions.`));
         }
         throw err;
     }
@@ -433,7 +433,7 @@ function getPublisherProjectFromName(publisherName) {
 exports.getPublisherProjectFromName = getPublisherProjectFromName;
 function displayReleaseNotes(publisherId, extensionId, versionId, releaseNotes) {
     const releaseNotesMessage = releaseNotes
-        ? ` Release notes for this version:\n${marked(releaseNotes)}\n`
+        ? ` Release notes for this version:\n${(0, marked_1.marked)(releaseNotes)}\n`
         : "\n";
     const message = `You are about to publish version ${clc.green(versionId)} of ${clc.green(`${publisherId}/${extensionId}`)} to Firebase's registry of extensions.${releaseNotesMessage}` +
         "Once an extension version is published, it cannot be changed. If you wish to make changes after publishing, you will need to publish a new version.\n\n";

package/lib/extensions/provisioningHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsedProducts = exports.bulkCheckProductsProvisioned = exports.checkProductsProvisioned = exports.DeferredProduct = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const functional_1 = require("../functional");
@@ -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(marked(errorMessage), { exit: 2 });
+        throw new error_1.FirebaseError((0, marked_1.marked)(errorMessage), { exit: 2 });
     }
 }
 function getUsedProducts(spec) {

package/lib/extensions/updateHelper.js

@@ -3,7 +3,7 @@ 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 } = require("marked");
+const marked_1 = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const extensionsApi = require("./extensionsApi");
@@ -47,7 +47,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(marked(warning));
+    logger_1.logger.info((0, marked_1.marked)(warning));
 }
 exports.warningUpdateToOtherSource = warningUpdateToOtherSource;
 async function update(updateOptions) {

package/lib/extensions/warnings.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.outOfBandChangesWarning = exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const clc = require("colorette");
 const types_1 = require("./types");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
@@ -16,11 +16,11 @@ function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     const publisherNameLink = githubLink ? `[${publisherId}](${githubLink})` : publisherId;
     const warningMsg = `This extension is in preview and is built by a developer in the [Extensions Publisher Early Access Program](http://bit.ly/firex-provider). Its functionality might change in backward-incompatible ways. Since this extension isn't built by Firebase, reach out to ${publisherNameLink} with questions about this extension.`;
     const legalMsg = "\n\nIt is provided “AS IS”, without any warranty, express or implied, from Google. Google disclaims all liability for any damages, direct or indirect, resulting from the use of the extension, and its functionality might change in backward - incompatible ways.";
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(warningMsg + legalMsg));
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(warningMsg + legalMsg));
     (0, displayExtensionInfo_1.printSourceDownloadLink)(sourceDownloadUri);
 }
 function displayExperimentalWarning() {
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`${clc.yellow(clc.bold("Important"))}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`${clc.yellow(clc.bold("Important"))}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
 }
 async function displayWarningPrompts(publisherId, launchStage, extensionVersion) {
     const trustedPublishers = await (0, resolveSource_1.getTrustedPublishers)();
@@ -58,11 +58,11 @@ async function displayWarningsForDeploy(instancesToCreate) {
     const experimental = nonEapExtensions.filter((i) => i.extension.registryLaunchStage === types_1.RegistryLaunchStage.EXPERIMENTAL);
     if (experimental.length) {
         const humanReadableList = experimental.map((i) => `\t${(0, deploymentSummary_1.humanReadable)(i)}`).join("\n");
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`The following are instances of ${clc.bold("experimental")} extensions.They may not be production-ready. Their functionality may change in backward-incompatible ways before their official release, or they may be discontinued.\n${humanReadableList}\n`, { gfm: false }));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`The following are instances of ${clc.bold("experimental")} extensions.They may not be production-ready. Their functionality may change in backward-incompatible ways before their official release, or they may be discontinued.\n${humanReadableList}\n`, { gfm: false }));
     }
     if (eapExtensions.length) {
         const humanReadableList = eapExtensions.map(toListEntry).join("\n");
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`These extensions are in preview and are built by a developer in the Extensions Publisher Early Access Program (http://bit.ly/firex-provider). Their functionality might change in backwards-incompatible ways. Since these extensions aren't built by Firebase, reach out to their publisher with questions about them.` +
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`These extensions are in preview and are built by a developer in the Extensions Publisher Early Access Program (http://bit.ly/firex-provider). Their functionality might change in backwards-incompatible ways. Since these extensions aren't built by Firebase, reach out to their publisher with questions about them.` +
             ` They are provided “AS IS”, without any warranty, express or implied, from Google.` +
             ` Google disclaims all liability for any damages, direct or indirect, resulting from the use of these extensions\n${humanReadableList}`, { gfm: false }));
     }

package/lib/firestore/checkDatabaseType.js

@@ -6,9 +6,9 @@ const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
 async function checkDatabaseType(projectId) {
     try {
-        const client = new apiv2_1.Client({ urlPrefix: api_1.appengineOrigin, apiVersion: "v1" });
-        const resp = await client.get(`/apps/${projectId}`);
-        return resp.body.databaseType;
+        const client = new apiv2_1.Client({ urlPrefix: api_1.firestoreOrigin, apiVersion: "v1" });
+        const resp = await client.get(`/projects/${projectId}/databases/(default)`);
+        return resp.body.type;
     }
     catch (err) {
         logger_1.logger.debug("error getting database type", err);

package/lib/frameworks/angular/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.getDevModeHandle = exports.build = exports.init = exports.discover = exports.type = exports.support = exports.name = void 0;
 const path_1 = require("path");
 const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const __1 = require("..");
@@ -23,9 +24,10 @@ async function discover(dir) {
     return { mayWantBackend: !!serverTarget, publicDirectory: (0, path_1.join)(dir, "src", "assets") };
 }
 exports.discover = discover;
-async function init(setup) {
-    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@latest ng new ${setup.hosting.source} --skip-git`, {
+async function init(setup, config) {
+    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@latest ng new ${setup.projectId} --directory ${setup.hosting.source} --skip-git`, {
         stdio: "inherit",
+        cwd: config.projectDir,
     });
     const useAngularUniversal = await (0, prompt_1.promptOnce)({
         name: "useAngularUniversal",
@@ -36,7 +38,7 @@ async function init(setup) {
     if (useAngularUniversal) {
         (0, child_process_1.execSync)("ng add @nguniversal/express-engine --skip-confirmation", {
             stdio: "inherit",
-            cwd: setup.hosting.source,
+            cwd: (0, path_1.join)(config.projectDir, setup.hosting.source),
         });
     }
 }
@@ -74,7 +76,7 @@ async function getDevModeHandle(dir) {
     if (!serveTarget)
         return;
     const host = new Promise((resolve) => {
-        const serve = (0, child_process_1.spawn)(CLI_COMMAND, ["run", targetStringFromTarget(serveTarget), "--host", "localhost"], { cwd: dir });
+        const serve = (0, cross_spawn_1.spawn)(CLI_COMMAND, ["run", targetStringFromTarget(serveTarget), "--host", "localhost"], { cwd: dir });
         serve.stdout.on("data", (data) => {
             process.stdout.write(data);
             const match = data.toString().match(/(http:\/\/localhost:\d+)/);

package/lib/frameworks/index.js

@@ -4,6 +4,7 @@ exports.createServerResponseProxy = exports.prepareFrameworks = exports.findDepe
 const path_1 = require("path");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const fs_1 = require("fs");
 const url_1 = require("url");
 const http_1 = require("http");
@@ -12,6 +13,7 @@ const fs_extra_1 = require("fs-extra");
 const clc = require("colorette");
 const process = require("node:process");
 const semver = require("semver");
+const glob = require("glob");
 const projectUtils_1 = require("../projectUtils");
 const config_1 = require("../hosting/config");
 const api_1 = require("../hosting/api");
@@ -106,7 +108,7 @@ function findDependency(name, options = {}) {
     const { cwd, depth, omitDev } = Object.assign(Object.assign({}, DEFAULT_FIND_DEP_OPTIONS), options);
     const env = Object.assign({}, process.env);
     delete env.NODE_ENV;
-    const result = (0, child_process_1.spawnSync)(NPM_COMMAND, [
+    const result = (0, cross_spawn_1.sync)(NPM_COMMAND, [
         "list",
         name,
         "--json",
@@ -120,8 +122,8 @@ function findDependency(name, options = {}) {
 }
 exports.findDependency = findDependency;
 async function prepareFrameworks(targetNames, context, options, emulators = []) {
-    var _a;
-    var _b, _c, _d, _e;
+    var _a, _b;
+    var _c, _d, _e, _f;
     const nodeVersion = process.version;
     if (!semver.satisfies(nodeVersion, ">=16.0.0")) {
         throw new error_1.FirebaseError(`The frameworks awareness feature requires Node.JS >= 16 and npm >= 8 in order to work correctly, due to some of the downstream dependencies. Please upgrade your version of Node.JS, reinstall firebase-tools, and give it another go.`);
@@ -133,7 +135,7 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
         try {
             await (0, requireHostingSite_1.requireHostingSite)(options);
         }
-        catch (_f) {
+        catch (_g) {
             options.site = project;
         }
     }
@@ -243,10 +245,11 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
             }
         }
         else {
-            const { wantsBackend = false, rewrites = [], redirects = [], headers = [], } = (await build(getProjectPath())) || {};
+            const { wantsBackend = false, rewrites = [], redirects = [], headers = [], trailingSlash, } = (await build(getProjectPath())) || {};
             config.rewrites.push(...rewrites);
             config.redirects.push(...redirects);
             config.headers.push(...headers);
+            (_b = config.trailingSlash) !== null && _b !== void 0 ? _b : (config.trailingSlash = trailingSlash);
             if (await (0, fs_extra_1.pathExists)(hostingDist))
                 await (0, promises_1.rm)(hostingDist, { recursive: true });
             await (0, fs_extra_1.mkdirp)(hostingDist);
@@ -319,19 +322,52 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
             packageJson.main = "server.js";
             delete packageJson.devDependencies;
             packageJson.dependencies || (packageJson.dependencies = {});
-            (_b = packageJson.dependencies)["firebase-frameworks"] || (_b["firebase-frameworks"] = exports.FIREBASE_FRAMEWORKS_VERSION);
-            (_c = packageJson.dependencies)["firebase-functions"] || (_c["firebase-functions"] = exports.FIREBASE_FUNCTIONS_VERSION);
-            (_d = packageJson.dependencies)["firebase-admin"] || (_d["firebase-admin"] = exports.FIREBASE_ADMIN_VERSION);
+            (_c = packageJson.dependencies)["firebase-frameworks"] || (_c["firebase-frameworks"] = exports.FIREBASE_FRAMEWORKS_VERSION);
+            (_d = packageJson.dependencies)["firebase-functions"] || (_d["firebase-functions"] = exports.FIREBASE_FUNCTIONS_VERSION);
+            (_e = packageJson.dependencies)["firebase-admin"] || (_e["firebase-admin"] = exports.FIREBASE_ADMIN_VERSION);
             packageJson.engines || (packageJson.engines = {});
-            (_e = packageJson.engines).node || (_e.node = exports.NODE_VERSION);
+            (_f = packageJson.engines).node || (_f.node = exports.NODE_VERSION);
+            for (const [name, version] of Object.entries(packageJson.dependencies)) {
+                if (version.startsWith("file:")) {
+                    const path = version.replace(/^file:/, "");
+                    if (!(await (0, fs_extra_1.pathExists)(path)))
+                        continue;
+                    const stats = await (0, fs_extra_1.stat)(path);
+                    if (stats.isDirectory()) {
+                        const result = (0, cross_spawn_1.sync)("npm", ["pack", (0, path_1.relative)(functionsDist, path)], {
+                            cwd: functionsDist,
+                        });
+                        if (!result.stdout)
+                            throw new Error(`Error running \`npm pack\` at ${path}`);
+                        const filename = result.stdout.toString().trim();
+                        packageJson.dependencies[name] = `file:${filename}`;
+                    }
+                    else {
+                        const filename = (0, path_1.basename)(path);
+                        await (0, promises_1.copyFile)(path, (0, path_1.join)(functionsDist, filename));
+                        packageJson.dependencies[name] = `file:${filename}`;
+                    }
+                }
+            }
             await (0, promises_1.writeFile)((0, path_1.join)(functionsDist, "package.json"), JSON.stringify(packageJson, null, 2));
-            await (0, promises_1.writeFile)((0, path_1.join)(functionsDist, ".env"), `__FIREBASE_FRAMEWORKS_ENTRY__=${frameworksEntry}
-${firebaseDefaults ? `__FIREBASE_DEFAULTS__=${JSON.stringify(firebaseDefaults)}\n` : ""}`);
             await (0, promises_1.copyFile)(getProjectPath("package-lock.json"), (0, path_1.join)(functionsDist, "package-lock.json")).catch(() => {
             });
             if (await (0, fs_extra_1.pathExists)(getProjectPath(".npmrc"))) {
                 await (0, promises_1.copyFile)(getProjectPath(".npmrc"), (0, path_1.join)(functionsDist, ".npmrc"));
             }
+            let existingDotEnvContents = "";
+            if (await (0, fs_extra_1.pathExists)(getProjectPath(".env"))) {
+                existingDotEnvContents = (await (0, promises_1.readFile)(getProjectPath(".env"))).toString();
+            }
+            await (0, promises_1.writeFile)((0, path_1.join)(functionsDist, ".env"), `${existingDotEnvContents}
+__FIREBASE_FRAMEWORKS_ENTRY__=${frameworksEntry}
+${firebaseDefaults ? `__FIREBASE_DEFAULTS__=${JSON.stringify(firebaseDefaults)}\n` : ""}`);
+            const envs = await new Promise((resolve, reject) => glob(getProjectPath(".env.*"), (err, matches) => {
+                if (err)
+                    reject(err);
+                resolve(matches);
+            }));
+            await Promise.all(envs.map((path) => (0, promises_1.copyFile)(path, (0, path_1.join)(functionsDist, (0, path_1.basename)(path)))));
             (0, child_process_1.execSync)(`${NPM_COMMAND} i --omit dev --no-audit`, {
                 cwd: functionsDist,
                 stdio: "inherit",

package/lib/frameworks/lit/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/frameworks/next/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.init = exports.build = exports.discover = exports.type = exports.support = exports.name = void 0;
 const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -9,6 +10,10 @@ const url_1 = require("url");
 const fs_1 = require("fs");
 const semver_1 = require("semver");
 const clc = require("colorette");
+const stream_chain_1 = require("stream-chain");
+const stream_json_1 = require("stream-json");
+const Pick_1 = require("stream-json/filters/Pick");
+const StreamObject_1 = require("stream-json/streamers/StreamObject");
 const __1 = require("..");
 const prompt_1 = require("../../prompt");
 const error_1 = require("../../error");
@@ -52,7 +57,7 @@ async function build(dir) {
         throw e;
     });
     const reasonsForBackend = [];
-    const { distDir } = await getConfig(dir);
+    const { distDir, trailingSlash } = await getConfig(dir);
     if (await (0, utils_1.isUsingMiddleware)((0, path_1.join)(dir, distDir), false)) {
         reasonsForBackend.push("middleware");
     }
@@ -96,7 +101,9 @@ async function build(dir) {
         source: (0, utils_1.cleanEscapedChars)(source),
         headers,
     }));
-    const isEveryRedirectSupported = nextJsRedirects.every(utils_1.isRedirectSupportedByHosting);
+    const isEveryRedirectSupported = nextJsRedirects
+        .filter((it) => !it.internal)
+        .every(utils_1.isRedirectSupportedByHosting);
     if (!isEveryRedirectSupported) {
         reasonsForBackend.push("advanced redirects");
     }
@@ -134,17 +141,17 @@ async function build(dir) {
         }
         console.log("");
     }
-    return { wantsBackend, headers, redirects, rewrites };
+    return { wantsBackend, headers, redirects, rewrites, trailingSlash };
 }
 exports.build = build;
-async function init(setup) {
+async function init(setup, config) {
     const language = await (0, prompt_1.promptOnce)({
         type: "list",
-        default: "JavaScript",
+        default: "TypeScript",
         message: "What language would you like to use?",
         choices: ["JavaScript", "TypeScript"],
     });
-    (0, child_process_1.execSync)(`npx --yes create-next-app@latest -e hello-world ${setup.hosting.source} --use-npm ${language === "TypeScript" ? "--ts" : ""}`, { stdio: "inherit" });
+    (0, child_process_1.execSync)(`npx --yes create-next-app@latest -e hello-world ${setup.hosting.source} --use-npm ${language === "TypeScript" ? "--ts" : "--js"}`, { stdio: "inherit", cwd: config.projectDir });
 }
 exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir) {
@@ -215,18 +222,38 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     const { distDir } = await getConfig(sourceDir);
     const packageJson = await (0, utils_2.readJSON)((0, path_1.join)(sourceDir, "package.json"));
     if ((0, fs_1.existsSync)((0, path_1.join)(sourceDir, "next.config.js"))) {
-        const dependencyTree = JSON.parse((0, child_process_1.spawnSync)("npm", ["ls", "--omit=dev", "--all", "--json"], {
-            cwd: sourceDir,
-        }).stdout.toString());
-        const esbuildArgs = (0, utils_1.allDependencyNames)(dependencyTree)
-            .map((it) => `--external:${it}`)
-            .concat("--bundle", "--platform=node", `--target=node${__1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
-        const bundle = (0, child_process_1.spawnSync)("npx", ["--yes", "esbuild", "next.config.js", ...esbuildArgs], {
-            cwd: sourceDir,
-        });
-        if (bundle.status) {
-            console.error(bundle.stderr.toString());
-            throw new error_1.FirebaseError("Unable to bundle next.config.js for use in Cloud Functions");
+        try {
+            const productionDeps = await new Promise((resolve) => {
+                const dependencies = [];
+                const pipeline = (0, stream_chain_1.chain)([
+                    (0, cross_spawn_1.spawn)("npm", ["ls", "--omit=dev", "--all", "--json"], { cwd: sourceDir }).stdout,
+                    (0, stream_json_1.parser)({ packValues: false, packKeys: true, streamValues: false }),
+                    (0, Pick_1.pick)({ filter: "dependencies" }),
+                    (0, StreamObject_1.streamObject)(),
+                    ({ key, value }) => [
+                        key,
+                        ...(0, utils_1.allDependencyNames)(value),
+                    ],
+                ]);
+                pipeline.on("data", (it) => dependencies.push(it));
+                pipeline.on("end", () => {
+                    resolve([...new Set(dependencies)]);
+                });
+            });
+            const esbuildArgs = productionDeps
+                .map((it) => `--external:${it}`)
+                .concat("--bundle", "--platform=node", `--target=node${__1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
+            const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", "esbuild", "next.config.js", ...esbuildArgs], {
+                cwd: sourceDir,
+            });
+            if (bundle.status) {
+                throw new error_1.FirebaseError(bundle.stderr.toString());
+            }
+        }
+        catch (e) {
+            console.warn("Unable to bundle next.config.js for use in Cloud Functions, proceeding with deploy but problems may be enountered.");
+            console.error(e.message);
+            (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, "next.config.js"), (0, path_1.join)(destDir, "next.config.js"));
         }
     }
     if (await (0, fs_extra_1.pathExists)((0, path_1.join)(sourceDir, "public"))) {
@@ -265,6 +292,7 @@ async function getDevModeHandle(dir, hostingEmulatorInfo) {
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(dir) {
+    var _a;
     let config = {};
     if ((0, fs_1.existsSync)((0, path_1.join)(dir, "next.config.js"))) {
         const version = getNextVersion(dir);
@@ -277,12 +305,12 @@ async function getConfig(dir) {
         }
         else {
             try {
-                config = await Promise.resolve().then(() => require((0, url_1.pathToFileURL)((0, path_1.join)(dir, "next.config.js")).toString()));
+                config = await (_a = (0, url_1.pathToFileURL)((0, path_1.join)(dir, "next.config.js")).toString(), Promise.resolve().then(() => require(_a)));
             }
             catch (e) {
                 throw new Error("Unable to load next.config.js.");
             }
         }
     }
-    return Object.assign({ distDir: ".next" }, config);
+    return Object.assign({ distDir: ".next", trailingSlash: false }, config);
 }

package/lib/frameworks/next/utils.js

@@ -87,6 +87,6 @@ function allDependencyNames(mod) {
     if (!mod.dependencies)
         return [];
     const dependencyNames = Object.keys(mod.dependencies).reduce((acc, it) => [...acc, it, ...allDependencyNames(mod.dependencies[it])], []);
-    return [...new Set(dependencyNames)];
+    return dependencyNames;
 }
 exports.allDependencyNames = allDependencyNames;