firebase-tools 15.1.0 → 15.2.0

package/lib/frameworks/compose/index.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compose = void 0;
+exports.compose = compose;
 const driver_1 = require("./driver");
 const discover_1 = require("./discover");
 async function compose(mode, fs, allFrameworkSpecs) {
-    var _a, _b, _c, _d;
     let bundle = { version: "v1alpha" };
     const spec = await (0, discover_1.discover)(fs, allFrameworkSpecs);
     const driver = (0, driver_1.getDriver)(mode, spec);
-    if ((_a = spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.run) {
+    if (spec.detectedCommands?.run) {
         bundle.server = {
             start: {
                 cmd: spec.detectedCommands.run.cmd.split(" "),
@@ -16,16 +15,15 @@ async function compose(mode, fs, allFrameworkSpecs) {
         };
     }
     driver.install();
-    if ((_b = spec.frameworkHooks) === null || _b === void 0 ? void 0 : _b.afterInstall) {
+    if (spec.frameworkHooks?.afterInstall) {
         bundle = driver.execHook(bundle, spec.frameworkHooks.afterInstall);
     }
     driver.build();
-    if ((_c = spec.frameworkHooks) === null || _c === void 0 ? void 0 : _c.afterBuild) {
-        bundle = driver.execHook(bundle, (_d = spec.frameworkHooks) === null || _d === void 0 ? void 0 : _d.afterBuild);
+    if (spec.frameworkHooks?.afterBuild) {
+        bundle = driver.execHook(bundle, spec.frameworkHooks?.afterBuild);
     }
     if (bundle.server) {
         driver.export(bundle);
     }
     return bundle;
 }
-exports.compose = compose;

package/lib/frameworks/constants.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_SHOULD_USE_DEV_MODE_HANDLE = exports.GET_DEFAULT_BUILD_TARGETS = exports.I18N_ROOT = exports.ALLOWED_SSR_REGIONS = exports.DEFAULT_REGION = exports.VALID_LOCALE_FORMATS = exports.VALID_ENGINES = exports.NODE_VERSION = exports.SHARP_VERSION = exports.FIREBASE_ADMIN_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.FIREBASE_FRAMEWORKS_VERSION = exports.MAILING_LIST_URL = exports.FEATURE_REQUEST_URL = exports.FILE_BUG_URL = exports.DEFAULT_DOCS_URL = exports.SupportLevelWarnings = exports.NPM_COMMAND_TIMEOUT_MILLIES = void 0;
+exports.I18N_ROOT = exports.ALLOWED_SSR_REGIONS = exports.DEFAULT_REGION = exports.VALID_LOCALE_FORMATS = exports.VALID_ENGINES = exports.NODE_VERSION = exports.SHARP_VERSION = exports.FIREBASE_ADMIN_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.FIREBASE_FRAMEWORKS_VERSION = exports.MAILING_LIST_URL = exports.FEATURE_REQUEST_URL = exports.FILE_BUG_URL = exports.DEFAULT_DOCS_URL = exports.SupportLevelWarnings = exports.NPM_COMMAND_TIMEOUT_MILLIES = void 0;
+exports.GET_DEFAULT_BUILD_TARGETS = GET_DEFAULT_BUILD_TARGETS;
+exports.DEFAULT_SHOULD_USE_DEV_MODE_HANDLE = DEFAULT_SHOULD_USE_DEV_MODE_HANDLE;
 const clc = require("colorette");
 const experiments = require("../experiments");
 exports.NPM_COMMAND_TIMEOUT_MILLIES = 60000;
@@ -60,8 +62,6 @@ exports.I18N_ROOT = "/";
 function GET_DEFAULT_BUILD_TARGETS() {
     return Promise.resolve(["production", "development"]);
 }
-exports.GET_DEFAULT_BUILD_TARGETS = GET_DEFAULT_BUILD_TARGETS;
 function DEFAULT_SHOULD_USE_DEV_MODE_HANDLE(target) {
     return Promise.resolve(target === "development");
 }
-exports.DEFAULT_SHOULD_USE_DEV_MODE_HANDLE = DEFAULT_SHOULD_USE_DEV_MODE_HANDLE;

package/lib/frameworks/express/index.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.docsUrl = exports.type = exports.support = exports.name = void 0;
+exports.docsUrl = exports.type = exports.support = exports.name = void 0;
+exports.discover = discover;
+exports.build = build;
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 const child_process_1 = require("child_process");
 const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
@@ -11,11 +15,10 @@ exports.support = "preview";
 exports.type = 0;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/express";
 async function getConfig(root) {
-    var _a, _b;
     const packageJsonBuffer = await (0, promises_1.readFile)((0, path_1.join)(root, "package.json"));
     const packageJson = JSON.parse(packageJsonBuffer.toString());
-    const serve = (_a = packageJson.directories) === null || _a === void 0 ? void 0 : _a.serve;
-    const serveDir = serve && (0, path_1.join)(root, (_b = packageJson.directories) === null || _b === void 0 ? void 0 : _b.serve);
+    const serve = packageJson.directories?.serve;
+    const serveDir = serve && (0, path_1.join)(root, packageJson.directories?.serve);
     return { serveDir, packageJson };
 }
 async function discover(dir) {
@@ -26,18 +29,15 @@ async function discover(dir) {
         return;
     return { mayWantBackend: true, publicDirectory };
 }
-exports.discover = discover;
 async function build(cwd) {
     (0, child_process_1.execSync)(`npm run build`, { stdio: "inherit", cwd });
     const wantsBackend = !!(await getBootstrapScript(cwd));
     return { wantsBackend };
 }
-exports.build = build;
 async function ɵcodegenPublicDirectory(root, dest) {
     const { serveDir } = await getConfig(root);
     await (0, fs_extra_1.copy)(serveDir, dest);
 }
-exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function getBootstrapScript(root, _bootstrapScript = "", _entry) {
     let entry = _entry;
     let bootstrapScript = _bootstrapScript;
@@ -99,4 +99,3 @@ async function ɵcodegenFunctionsDirectory(root, dest) {
     packageJson.dependencies[packageJson.name] = `file:${filename}`;
     return { bootstrapScript, packageJson };
 }
-exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;

package/lib/frameworks/flutter/index.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ɵcodegenPublicDirectory = exports.build = exports.init = exports.discover = exports.support = exports.type = exports.name = void 0;
+exports.support = exports.type = exports.name = void 0;
+exports.discover = discover;
+exports.init = init;
+exports.build = build;
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 const cross_spawn_1 = require("cross-spawn");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -11,18 +15,16 @@ exports.name = "Flutter Web";
 exports.type = 3;
 exports.support = "experimental";
 async function discover(dir) {
-    var _a;
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "pubspec.yaml"))))
         return;
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "web"))))
         return;
     const pubSpec = await (0, utils_1.getPubSpec)(dir);
-    const usingFlutter = (_a = pubSpec.dependencies) === null || _a === void 0 ? void 0 : _a.flutter;
+    const usingFlutter = pubSpec.dependencies?.flutter;
     if (!usingFlutter)
         return;
     return { mayWantBackend: false };
 }
-exports.discover = discover;
 function init(setup, config) {
     (0, utils_1.assertFlutterCliExists)();
     const projectName = constants_1.DART_RESERVED_WORDS.includes(setup.projectId)
@@ -40,7 +42,6 @@ function init(setup, config) {
         throw new error_1.FirebaseError("We were not able to create your flutter app, create the application yourself https://docs.flutter.dev/get-started/test-drive?tab=terminal before trying again.");
     return Promise.resolve();
 }
-exports.init = init;
 async function build(cwd) {
     (0, utils_1.assertFlutterCliExists)();
     const pubSpec = await (0, utils_1.getPubSpec)(cwd);
@@ -51,8 +52,6 @@ async function build(cwd) {
         throw new error_1.FirebaseError("Unable to build your Flutter app");
     return Promise.resolve({ wantsBackend: false });
 }
-exports.build = build;
 async function ɵcodegenPublicDirectory(sourceDir, destDir) {
     await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, "build", "web"), destDir);
 }
-exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;

package/lib/frameworks/flutter/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPubSpec = exports.getAdditionalBuildArgs = exports.assertFlutterCliExists = void 0;
+exports.assertFlutterCliExists = assertFlutterCliExists;
+exports.getAdditionalBuildArgs = getAdditionalBuildArgs;
+exports.getPubSpec = getPubSpec;
 const cross_spawn_1 = require("cross-spawn");
 const error_1 = require("../../error");
 const promises_1 = require("fs/promises");
@@ -12,7 +14,6 @@ function assertFlutterCliExists() {
     if (process.status !== 0)
         throw new error_1.FirebaseError("Flutter CLI not found, follow the instructions here https://docs.flutter.dev/get-started/install before trying again.");
 }
-exports.assertFlutterCliExists = assertFlutterCliExists;
 function getAdditionalBuildArgs(pubSpec) {
     const treeShakePackages = [
         "material_icons_named",
@@ -22,11 +23,10 @@ function getAdditionalBuildArgs(pubSpec) {
         "font_awesome_flutter",
         "ionicons_named",
     ];
-    const hasTreeShakePackage = treeShakePackages.some((pkg) => { var _a; return (_a = pubSpec.dependencies) === null || _a === void 0 ? void 0 : _a[pkg]; });
+    const hasTreeShakePackage = treeShakePackages.some((pkg) => pubSpec.dependencies?.[pkg]);
     const treeShakeFlags = hasTreeShakePackage ? ["--no-tree-shake-icons"] : [];
     return [...treeShakeFlags];
 }
-exports.getAdditionalBuildArgs = getAdditionalBuildArgs;
 async function getPubSpec(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "pubspec.yaml"))))
         return {};
@@ -41,4 +41,3 @@ async function getPubSpec(dir) {
         return {};
     }
 }
-exports.getPubSpec = getPubSpec;

package/lib/frameworks/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareFrameworks = exports.generateSSRCodebaseId = exports.discover = exports.WebFrameworks = void 0;
+exports.WebFrameworks = void 0;
+exports.discover = discover;
+exports.generateSSRCodebaseId = generateSSRCodebaseId;
+exports.prepareFrameworks = prepareFrameworks;
 const path_1 = require("path");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
@@ -46,7 +49,7 @@ async function discover(dir, warn = true) {
                     continue;
                 const result = await discover(dir);
                 if (result)
-                    frameworksDiscovered.push(Object.assign({ framework }, result));
+                    frameworksDiscovered.push({ framework, ...result });
             }
         }
         if (frameworksDiscovered.length > 1) {
@@ -61,7 +64,6 @@ async function discover(dir, warn = true) {
         console.warn("Could not determine the web framework in use.");
     return;
 }
-exports.discover = discover;
 const BUILD_MEMO = new Map();
 function memoizeBuild(dir, build, deps, target, context) {
     const key = [dir, ...deps];
@@ -77,10 +79,8 @@ function memoizeBuild(dir, build, deps, target, context) {
 function generateSSRCodebaseId(site) {
     return `firebase-frameworks-${site}`;
 }
-exports.generateSSRCodebaseId = generateSSRCodebaseId;
 async function prepareFrameworks(purpose, targetNames, context, options, emulators = []) {
-    var _a, _b, _c, _d, _e, _f;
-    var _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e;
     const project = (0, projectUtils_1.needProjectId)(context || options);
     const isDemoProject = constants_1.Constants.isDemoProject(project);
     const projectRoot = (0, projectPath_1.resolveProjectPath)(options, ".");
@@ -92,7 +92,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
         try {
             await (0, requireHostingSite_1.requireHostingSite)(options);
         }
-        catch (_m) {
+        catch {
             options.site = project;
         }
     }
@@ -110,15 +110,15 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
         config.rewrites || (config.rewrites = []);
         config.redirects || (config.redirects = []);
         config.headers || (config.headers = []);
-        (_a = config.cleanUrls) !== null && _a !== void 0 ? _a : (config.cleanUrls = true);
+        config.cleanUrls ?? (config.cleanUrls = true);
         const dist = (0, path_1.join)(projectRoot, ".firebase", site);
         const hostingDist = (0, path_1.join)(dist, "hosting");
         const functionsDist = (0, path_1.join)(dist, "functions");
         if (publicDir) {
             throw new Error(`hosting.public and hosting.source cannot both be set in firebase.json`);
         }
-        const ssrRegion = (_b = frameworksBackend === null || frameworksBackend === void 0 ? void 0 : frameworksBackend.region) !== null && _b !== void 0 ? _b : constants_2.DEFAULT_REGION;
-        const omitCloudFunction = (_c = frameworksBackend === null || frameworksBackend === void 0 ? void 0 : frameworksBackend.omit) !== null && _c !== void 0 ? _c : false;
+        const ssrRegion = frameworksBackend?.region ?? constants_2.DEFAULT_REGION;
+        const omitCloudFunction = frameworksBackend?.omit ?? false;
         if (!allowedRegionsValues.includes(ssrRegion)) {
             const validRegions = (0, utils_1.conjoinOptions)(allowedRegionsValues);
             throw new error_1.FirebaseError(`Hosting config for site ${site} places server-side content in region ${ssrRegion} which is not known. Valid regions are ${validRegions}`);
@@ -206,7 +206,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
         const frameworkContext = {
             projectId: project,
             site: options.site,
-            hostingChannel: context === null || context === void 0 ? void 0 : context.hostingChannel,
+            hostingChannel: context?.hostingChannel,
         };
         let codegenFunctionsDirectory;
         let baseUrl = "";
@@ -226,7 +226,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             const buildResult = await memoizeBuild(getProjectPath(), build, [firebaseDefaults, frameworksBuildTarget], frameworksBuildTarget, frameworkContext);
             const { wantsBackend = false, trailingSlash, i18n = false } = buildResult || {};
             if (buildResult) {
-                baseUrl = (_d = buildResult.baseUrl) !== null && _d !== void 0 ? _d : baseUrl;
+                baseUrl = buildResult.baseUrl ?? baseUrl;
                 if (buildResult.headers)
                     headers.push(...buildResult.headers);
                 if (buildResult.rewrites)
@@ -234,9 +234,9 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
                 if (buildResult.redirects)
                     redirects.push(...buildResult.redirects);
             }
-            (_e = config.trailingSlash) !== null && _e !== void 0 ? _e : (config.trailingSlash = trailingSlash);
+            config.trailingSlash ?? (config.trailingSlash = trailingSlash);
             if (i18n)
-                (_f = config.i18n) !== null && _f !== void 0 ? _f : (config.i18n = { root: constants_2.I18N_ROOT });
+                config.i18n ?? (config.i18n = { root: constants_2.I18N_ROOT });
             if (await (0, fs_extra_1.pathExists)(hostingDist))
                 await (0, promises_1.rm)(hostingDist, { recursive: true });
             await (0, fs_extra_1.mkdirp)(hostingDist);
@@ -254,7 +254,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
                 firebaseDefaults._authTokenSyncURL = "/__session";
                 process.env.__FIREBASE_DEFAULTS__ = JSON.stringify(firebaseDefaults);
             }
-            if (context === null || context === void 0 ? void 0 : context.hostingChannel) {
+            if (context?.hostingChannel) {
                 experiments.assertEnabled("pintags", "deploy an app that requires a backend to a preview channel");
             }
             const codebase = generateSSRCodebaseId(site);
@@ -278,7 +278,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             }
             if (await (0, fs_extra_1.pathExists)(functionsDist)) {
                 const functionsDistStat = await (0, fs_extra_1.stat)(functionsDist);
-                if (functionsDistStat === null || functionsDistStat === void 0 ? void 0 : functionsDistStat.isDirectory()) {
+                if (functionsDistStat?.isDirectory()) {
                     const files = await (0, promises_1.readdir)(functionsDist);
                     for (const file of files) {
                         if (file !== "node_modules" && file !== "package-lock.json")
@@ -310,23 +310,23 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             process.env.__FIREBASE_FRAMEWORKS_ENTRY__ = frameworksEntry;
             packageJson.main = "server.js";
             packageJson.dependencies || (packageJson.dependencies = {});
-            (_g = packageJson.dependencies)["firebase-frameworks"] || (_g["firebase-frameworks"] = constants_2.FIREBASE_FRAMEWORKS_VERSION);
-            (_h = packageJson.dependencies)["firebase-functions"] || (_h["firebase-functions"] = constants_2.FIREBASE_FUNCTIONS_VERSION);
-            (_j = packageJson.dependencies)["firebase-admin"] || (_j["firebase-admin"] = constants_2.FIREBASE_ADMIN_VERSION);
+            (_a = packageJson.dependencies)["firebase-frameworks"] || (_a["firebase-frameworks"] = constants_2.FIREBASE_FRAMEWORKS_VERSION);
+            (_b = packageJson.dependencies)["firebase-functions"] || (_b["firebase-functions"] = constants_2.FIREBASE_FUNCTIONS_VERSION);
+            (_c = packageJson.dependencies)["firebase-admin"] || (_c["firebase-admin"] = constants_2.FIREBASE_ADMIN_VERSION);
             packageJson.engines || (packageJson.engines = {});
             const validEngines = constants_2.VALID_ENGINES.node.filter((it) => it <= constants_2.NODE_VERSION);
             const engine = validEngines[validEngines.length - 1] || constants_2.VALID_ENGINES.node[0];
             if (engine !== constants_2.NODE_VERSION) {
                 (0, utils_2.logWarning)(`This integration expects Node version ${(0, utils_1.conjoinOptions)(constants_2.VALID_ENGINES.node, "or")}. You're running version ${constants_2.NODE_VERSION}, problems may be encountered.`);
             }
-            (_k = packageJson.engines).node || (_k.node = engine.toString());
+            (_d = packageJson.engines).node || (_d.node = engine.toString());
             delete packageJson.scripts;
             delete packageJson.devDependencies;
             const bundledDependencies = packageJson.bundledDependencies || {};
             if (Object.keys(bundledDependencies).length) {
                 (0, utils_2.logWarning)("Bundled dependencies aren't supported in Cloud Functions, converting to dependencies.");
                 for (const [dep, version] of Object.entries(bundledDependencies)) {
-                    (_l = packageJson.dependencies)[dep] || (_l[dep] = version);
+                    (_e = packageJson.dependencies)[dep] || (_e[dep] = version);
                 }
                 delete packageJson.bundledDependencies;
             }
@@ -420,7 +420,6 @@ ${firebaseDefaults ? `__FIREBASE_DEFAULTS__=${JSON.stringify(firebaseDefaults)}\
     delete process.env.__FIREBASE_DEFAULTS__;
     delete process.env.__FIREBASE_FRAMEWORKS_ENTRY__;
 }
-exports.prepareFrameworks = prepareFrameworks;
 function codegenDevModeFunctionsDirectory() {
     const packageJson = {};
     return Promise.resolve({ packageJson, frameworksEntry: "_devMode" });

package/lib/frameworks/next/constants.js

@@ -24,7 +24,9 @@ const WEBPACK_LAYERS_NAMES = {
     appMetadataRoute: "app-metadata-route",
     appRouteHandler: "app-route-handler",
 };
-exports.WEBPACK_LAYERS = Object.assign(Object.assign({}, WEBPACK_LAYERS_NAMES), { GROUP: {
+exports.WEBPACK_LAYERS = {
+    ...WEBPACK_LAYERS_NAMES,
+    GROUP: {
         server: [
             WEBPACK_LAYERS_NAMES.reactServerComponents,
             WEBPACK_LAYERS_NAMES.actionBrowser,
@@ -44,4 +46,5 @@ exports.WEBPACK_LAYERS = Object.assign(Object.assign({}, WEBPACK_LAYERS_NAMES),
             WEBPACK_LAYERS_NAMES.appPagesBrowser,
             WEBPACK_LAYERS_NAMES.shared,
         ],
-    } });
+    },
+};

package/lib/frameworks/next/index.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.init = exports.build = exports.discover = exports.docsUrl = exports.type = exports.support = exports.name = exports.supportedRange = void 0;
+exports.docsUrl = exports.type = exports.support = exports.name = exports.supportedRange = void 0;
+exports.discover = discover;
+exports.build = build;
+exports.init = init;
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
+exports.getDevModeHandle = getDevModeHandle;
 const child_process_1 = require("child_process");
 const cross_spawn_1 = require("cross-spawn");
 const promises_1 = require("fs/promises");
@@ -32,8 +38,7 @@ exports.type = 2;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/nextjs";
 const DEFAULT_NUMBER_OF_REASONS_TO_LIST = 5;
 function getReactVersion(cwd) {
-    var _a;
-    return (_a = (0, utils_1.findDependency)("react-dom", { cwd, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
+    return (0, utils_1.findDependency)("react-dom", { cwd, omitDev: false })?.version;
 }
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
@@ -43,23 +48,21 @@ async function discover(dir) {
         return;
     return { mayWantBackend: true, publicDirectory: (0, path_1.join)(dir, PUBLIC_DIR), version };
 }
-exports.discover = discover;
 async function build(dir, target, context) {
-    var _a, _b;
     await (0, utils_1.warnIfCustomBuildScript)(dir, exports.name, DEFAULT_BUILD_SCRIPT);
     const reactVersion = getReactVersion(dir);
     if (reactVersion && (0, semver_1.gte)(reactVersion, "18.0.0")) {
         process.env.__NEXT_REACT_ROOT = "true";
     }
-    let env = Object.assign({}, process.env);
-    if (context === null || context === void 0 ? void 0 : context.projectId) {
+    let env = { ...process.env };
+    if (context?.projectId) {
         const projectEnvPath = (0, path_1.join)(dir, `.env.${context.projectId}`);
         if (await (0, fs_extra_1.pathExists)(projectEnvPath)) {
             const projectEnvVars = (0, env_1.parseStrict)((await (0, fs_extra_1.readFile)(projectEnvPath)).toString());
-            env = Object.assign(Object.assign({}, projectEnvVars), env);
+            env = { ...projectEnvVars, ...env };
         }
     }
-    if ((context === null || context === void 0 ? void 0 : context.projectId) && (context === null || context === void 0 ? void 0 : context.site)) {
+    if (context?.projectId && context?.site) {
         const deploymentDomain = await (0, api_1.getDeploymentDomain)(context.projectId, context.site, context.hostingChannel);
         if (deploymentDomain) {
             env["VERCEL_URL"] = deploymentDomain;
@@ -67,10 +70,9 @@ async function build(dir, target, context) {
     }
     const cli = (0, utils_1.getNodeModuleBin)("next", dir);
     const nextBuild = new Promise((resolve, reject) => {
-        var _a, _b;
         const buildProcess = (0, cross_spawn_1.spawn)(cli, ["build"], { cwd: dir, env });
-        (_a = buildProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => logger_1.logger.info(data.toString()));
-        (_b = buildProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => logger_1.logger.info(data.toString()));
+        buildProcess.stdout?.on("data", (data) => logger_1.logger.info(data.toString()));
+        buildProcess.stderr?.on("data", (data) => logger_1.logger.info(data.toString()));
         buildProcess.on("error", (err) => {
             reject(new error_1.FirebaseError(`Unable to build your Next.js app: ${err}`));
         });
@@ -164,7 +166,7 @@ async function build(dir, target, context) {
     }));
     const nextJsRewritesToUse = (0, utils_2.getNextjsRewritesToUse)(nextJsRewrites);
     if (!Array.isArray(nextJsRewrites) &&
-        (((_a = nextJsRewrites.afterFiles) === null || _a === void 0 ? void 0 : _a.length) || ((_b = nextJsRewrites.fallback) === null || _b === void 0 ? void 0 : _b.length))) {
+        (nextJsRewrites.afterFiles?.length || nextJsRewrites.fallback?.length)) {
         reasonsForBackend.add("advanced rewrites");
     }
     const isEveryRewriteSupported = nextJsRewritesToUse.every(utils_2.isRewriteSupportedByHosting);
@@ -227,7 +229,6 @@ async function build(dir, target, context) {
         baseUrl,
     };
 }
-exports.build = build;
 async function init(setup, config) {
     const language = await (0, prompt_1.select)({
         default: "TypeScript",
@@ -240,11 +241,10 @@ async function init(setup, config) {
     (0, child_process_1.execSync)(`npx --yes create-next-app@"${exports.supportedRange}" -e hello-world ` +
         `${setup.featureInfo.hosting.source} --use-npm --${language}`, { stdio: "inherit", cwd: config.projectDir });
 }
-exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
     const { distDir, i18n, basePath } = await getConfig(sourceDir);
     let matchingI18nDomain = undefined;
-    if (i18n === null || i18n === void 0 ? void 0 : i18n.domains) {
+    if (i18n?.domains) {
         const siteDomains = await (0, api_1.getAllSiteDomains)(context.project, context.site);
         matchingI18nDomain = i18n.domains.find(({ domain }) => siteDomains.includes(domain));
     }
@@ -299,10 +299,12 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
             },
         ];
     }));
-    const routesToCopy = Object.assign(Object.assign({}, prerenderManifest.routes), pagesManifestLikePrerender);
+    const routesToCopy = {
+        ...prerenderManifest.routes,
+        ...pagesManifestLikePrerender,
+    };
     const { pprRoutes } = await (0, utils_2.getAppMetadataFromMetaFiles)(sourceDir, distDir, basePath, appPathRoutesManifest);
     await Promise.all(Object.entries(routesToCopy).map(async ([path, route]) => {
-        var _a, _b;
         if (route.initialRevalidateSeconds) {
             logger_1.logger.debug(`skipping ${path} due to revalidate`);
             return;
@@ -315,10 +317,10 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
             logger_1.logger.debug(`skipping ${path} due to server action`);
             return;
         }
-        const appPathRoute = route.srcRoute && ((_a = appPathRoutesEntries.find(([, it]) => it === route.srcRoute)) === null || _a === void 0 ? void 0 : _a[0]);
+        const appPathRoute = route.srcRoute && appPathRoutesEntries.find(([, it]) => it === route.srcRoute)?.[0];
         const contentDist = (0, path_1.join)(sourceDir, distDir, "server", appPathRoute ? "app" : "pages");
         const sourceParts = path.split("/").filter((it) => !!it);
-        const locale = (i18n === null || i18n === void 0 ? void 0 : i18n.locales.includes(sourceParts[0])) ? sourceParts[0] : undefined;
+        const locale = i18n?.locales.includes(sourceParts[0]) ? sourceParts[0] : undefined;
         const includeOnThisDomain = !locale ||
             !matchingI18nDomain ||
             matchingI18nDomain.defaultLocale === locale ||
@@ -331,7 +333,7 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
         const sourcePartsOrIndex = sourceParts.length > 0 ? sourceParts : ["index"];
         const destParts = sourceParts.slice(locale ? 1 : 0);
         const destPartsOrIndex = destParts.length > 0 ? destParts : ["index"];
-        const isDefaultLocale = !locale || ((_b = (matchingI18nDomain || i18n)) === null || _b === void 0 ? void 0 : _b.defaultLocale) === locale;
+        const isDefaultLocale = !locale || (matchingI18nDomain || i18n)?.defaultLocale === locale;
         let sourcePath = (0, path_1.join)(contentDist, ...sourcePartsOrIndex);
         let localizedDestPath = !singleLocaleDomain &&
             locale &&
@@ -373,7 +375,6 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
         }
     }));
 }
-exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context) {
     const { distDir } = await getConfig(sourceDir);
     const packageJson = await (0, utils_1.readJSON)((0, path_1.join)(sourceDir, "package.json"));
@@ -445,7 +446,7 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
         packageJson.dependencies["sharp"] = constants_1.SHARP_VERSION;
     }
     const dotEnv = {};
-    if ((context === null || context === void 0 ? void 0 : context.projectId) && (context === null || context === void 0 ? void 0 : context.site)) {
+    if (context?.projectId && context?.site) {
         const deploymentDomain = await (0, api_1.getDeploymentDomain)(context.projectId, context.site, context.hostingChannel);
         if (deploymentDomain) {
             dotEnv["VERCEL_URL"] = deploymentDomain;
@@ -460,7 +461,6 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
     })));
     return { packageJson, frameworksEntry: "next.js", dotEnv };
 }
-exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 async function getDevModeHandle(dir, _, hostingEmulatorInfo) {
     if (!hostingEmulatorInfo) {
         if (await (0, utils_2.isUsingMiddleware)(dir, true)) {
@@ -473,8 +473,8 @@ async function getDevModeHandle(dir, _, hostingEmulatorInfo) {
     const nextApp = next({
         dev: true,
         dir,
-        hostname: hostingEmulatorInfo === null || hostingEmulatorInfo === void 0 ? void 0 : hostingEmulatorInfo.host,
-        port: hostingEmulatorInfo === null || hostingEmulatorInfo === void 0 ? void 0 : hostingEmulatorInfo.port,
+        hostname: hostingEmulatorInfo?.host,
+        port: hostingEmulatorInfo?.port,
     });
     const handler = nextApp.getRequestHandler();
     await nextApp.prepare();
@@ -483,10 +483,7 @@ async function getDevModeHandle(dir, _, hostingEmulatorInfo) {
         await handler(req, res, parsedUrl);
     });
 }
-exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(dir) {
-    var _a;
-    var _b;
     let config = {};
     const configFile = await (0, utils_2.whichNextConfigFile)(dir);
     if (configFile) {
@@ -502,13 +499,18 @@ async function getConfig(dir) {
         }
         else {
             try {
-                config = await (_a = (0, url_1.pathToFileURL)((0, path_1.join)(dir, configFile)).toString(), Promise.resolve().then(() => require(_a)));
+                config = await Promise.resolve(`${(0, url_1.pathToFileURL)((0, path_1.join)(dir, configFile)).toString()}`).then(s => require(s));
             }
             catch (e) {
                 throw new Error(`Unable to load ${configFile}.`);
             }
         }
     }
-    (0, utils_1.validateLocales)((_b = config.i18n) === null || _b === void 0 ? void 0 : _b.locales);
-    return Object.assign({ distDir: ".next", trailingSlash: false, basePath: "/" }, config);
+    (0, utils_1.validateLocales)(config.i18n?.locales);
+    return {
+        distDir: ".next",
+        trailingSlash: false,
+        basePath: "/",
+        ...config,
+    };
 }