firebase-tools 15.1.0 → 15.2.0

package/lib/firestore/validator.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertType = exports.assertEnum = exports.assertHasOneOf = exports.assertHas = void 0;
+exports.assertHas = assertHas;
+exports.assertHasOneOf = assertHasOneOf;
+exports.assertEnum = assertEnum;
+exports.assertType = assertType;
 const clc = require("colorette");
 const error_1 = require("../error");
 function assertHas(obj, prop) {
@@ -9,7 +12,6 @@ function assertHas(obj, prop) {
         throw new error_1.FirebaseError(`Must contain "${prop}": ${objString}`);
     }
 }
-exports.assertHas = assertHas;
 function assertHasOneOf(obj, props) {
     const objString = clc.cyan(JSON.stringify(obj));
     let count = 0;
@@ -22,17 +24,14 @@ function assertHasOneOf(obj, props) {
         throw new error_1.FirebaseError(`Must contain exactly one of "${props.join(",")}": ${objString}`);
     }
 }
-exports.assertHasOneOf = assertHasOneOf;
 function assertEnum(obj, prop, valid) {
     const objString = clc.cyan(JSON.stringify(obj));
     if (valid.indexOf(obj[prop]) < 0) {
         throw new error_1.FirebaseError(`Field "${prop}" must be one of ${valid.join(", ")}: ${objString}`);
     }
 }
-exports.assertEnum = assertEnum;
 function assertType(prop, propValue, type) {
     if (typeof propValue !== type) {
         throw new error_1.FirebaseError(`Property "${prop}" must be of type ${type}`);
     }
 }
-exports.assertType = assertType;

package/lib/frameworks/angular/index.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ɵcodegenFunctionsDirectory = exports.shouldUseDevModeHandle = exports.getValidBuildTargets = exports.ɵcodegenPublicDirectory = exports.getDevModeHandle = exports.build = exports.init = exports.discover = exports.supportedRange = exports.docsUrl = exports.type = exports.support = exports.name = void 0;
+exports.supportedRange = exports.docsUrl = exports.type = exports.support = exports.name = void 0;
+exports.discover = discover;
+exports.init = init;
+exports.build = build;
+exports.getDevModeHandle = getDevModeHandle;
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+exports.getValidBuildTargets = getValidBuildTargets;
+exports.shouldUseDevModeHandle = shouldUseDevModeHandle;
+exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const cross_spawn_1 = require("cross-spawn");
@@ -24,7 +32,6 @@ async function discover(dir) {
     const version = (0, utils_2.getAngularVersion)(dir);
     return { mayWantBackend: true, version };
 }
-exports.discover = discover;
 function init(setup, config) {
     (0, child_process_1.execSync)(`npx --yes -p @angular/cli@"${exports.supportedRange}" ng new ${setup.projectId} --directory ${setup.featureInfo.hosting.source} --skip-git`, {
         stdio: "inherit",
@@ -32,7 +39,6 @@ function init(setup, config) {
     });
     return Promise.resolve();
 }
-exports.init = init;
 async function build(dir, configuration) {
     const { targets, serveOptimizedImages, locales, baseHref: baseUrl, ssr, } = await (0, utils_2.getBuildConfig)(dir, configuration);
     await (0, utils_1.warnIfCustomBuildScript)(dir, exports.name, DEFAULT_BUILD_SCRIPT);
@@ -57,7 +63,6 @@ async function build(dir, configuration) {
     const i18n = !!locales;
     return { wantsBackend, i18n, rewrites, baseUrl };
 }
-exports.build = build;
 async function getDevModeHandle(dir, configuration) {
     const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
     const { serveTarget } = await (0, utils_2.getContext)(dir, configuration);
@@ -81,7 +86,6 @@ async function getDevModeHandle(dir, configuration) {
     });
     return (0, utils_1.simpleProxy)(await host);
 }
-exports.getDevModeHandle = getDevModeHandle;
 async function ɵcodegenPublicDirectory(sourceDir, destDir, configuration) {
     const { outputPath, baseHref, defaultLocale, locales } = await (0, utils_2.getBrowserConfig)(sourceDir, configuration);
     await (0, promises_1.mkdir)((0, path_1.join)(destDir, baseHref), { recursive: true });
@@ -100,7 +104,6 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, configuration) {
         await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, outputPath), (0, path_1.join)(destDir, baseHref));
     }
 }
-exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function getValidBuildTargets(purpose, dir) {
     const validTargetNames = new Set(["development", "production"]);
     try {
@@ -117,17 +120,14 @@ async function getValidBuildTargets(purpose, dir) {
     const allTargets = await (0, utils_2.getAllTargets)(purpose, dir);
     return [...validTargetNames, ...allTargets];
 }
-exports.getValidBuildTargets = getValidBuildTargets;
 async function shouldUseDevModeHandle(targetOrConfiguration, dir) {
     const { serveTarget } = await (0, utils_2.getContext)(dir, targetOrConfiguration);
     if (!serveTarget)
         return false;
     return serveTarget.configuration !== "production";
 }
-exports.shouldUseDevModeHandle = shouldUseDevModeHandle;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir, configuration) {
     var _a;
-    var _b;
     const { packageJson, serverOutputPath, browserOutputPath, defaultLocale, serverLocales, browserLocales, bundleDependencies, externalDependencies, baseHref, serveOptimizedImages, serverEntry, } = await (0, utils_2.getServerConfig)(sourceDir, configuration);
     const dotEnv = { __NG_BROWSER_OUTPUT_PATH__: browserOutputPath };
     let rewriteSource = undefined;
@@ -140,7 +140,7 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, configuration) {
     if (bundleDependencies) {
         const dependencies = {};
         for (const externalDependency of externalDependencies) {
-            const packageVersion = (_a = (0, utils_1.findDependency)(externalDependency)) === null || _a === void 0 ? void 0 : _a.version;
+            const packageVersion = (0, utils_1.findDependency)(externalDependency)?.version;
             if (packageVersion) {
                 dependencies[externalDependency] = packageVersion;
             }
@@ -154,11 +154,11 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, configuration) {
         packageJson.dependencies = {};
     }
     if (serveOptimizedImages) {
-        (_b = packageJson.dependencies)["sharp"] || (_b["sharp"] = constants_1.SHARP_VERSION);
+        (_a = packageJson.dependencies)["sharp"] || (_a["sharp"] = constants_1.SHARP_VERSION);
     }
     let bootstrapScript;
     if (browserLocales) {
-        const locales = serverLocales === null || serverLocales === void 0 ? void 0 : serverLocales.filter((it) => browserLocales.includes(it));
+        const locales = serverLocales?.filter((it) => browserLocales.includes(it));
         bootstrapScript = `const localizedApps = new Map();
 const ffi18n = import("firebase-frameworks/i18n");
 exports.handle = function(req,res) {
@@ -169,7 +169,7 @@ exports.handle = function(req,res) {
     if (localizedApps.has(locale)) {
       localizedApps.get(locale)(req,res);
     } else {
-      ${(serverEntry === null || serverEntry === void 0 ? void 0 : serverEntry.endsWith(".mjs"))
+      ${serverEntry?.endsWith(".mjs")
             ? `import(\`./${serverOutputPath}/\${locale}/${serverEntry}\`)`
             : `Promise.resolve(require(\`./${serverOutputPath}/\${locale}/${serverEntry}\`))`}.then(server => {
         const app = server.app(locale);
@@ -188,7 +188,7 @@ exports.handle = function(req,res) {
         const socket = 'express.sock';
         process.env.PORT = socket;
 
-        ${(serverEntry === null || serverEntry === void 0 ? void 0 : serverEntry.endsWith(".mjs"))
+        ${serverEntry?.endsWith(".mjs")
             ? `import(\`./${serverOutputPath}/${serverEntry}\`)`
             : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`}.then(({ default: defHandler, reqHandler, app }) => {
           const handler = app?.() ?? reqHandler ?? defHandler;
@@ -209,4 +209,3 @@ exports.handle = (req,res) => app.then(it => it(req,res));\n`;
     }
     return { bootstrapScript, packageJson, dotEnv, rewriteSource };
 }
-exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;

package/lib/frameworks/angular/utils.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBuilderType = exports.tryToGetOptionsForTarget = exports.getAngularVersion = exports.getBuildConfig = exports.getServerConfig = exports.getBrowserConfig = exports.getContext = exports.getAllTargets = exports.BuilderType = void 0;
+exports.BuilderType = void 0;
+exports.getAllTargets = getAllTargets;
+exports.getContext = getContext;
+exports.getBrowserConfig = getBrowserConfig;
+exports.getServerConfig = getServerConfig;
+exports.getBuildConfig = getBuildConfig;
+exports.getAngularVersion = getAngularVersion;
+exports.tryToGetOptionsForTarget = tryToGetOptionsForTarget;
+exports.getBuilderType = getBuilderType;
 const utils_1 = require("../utils");
 const error_1 = require("../../error");
 const path_1 = require("path");
@@ -8,7 +16,6 @@ const assert_1 = require("assert");
 const utils_2 = require("../../utils");
 const semver_1 = require("semver");
 async function localesForTarget(dir, architectHost, target, workspaceProject) {
-    var _a;
     const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
     const targetOptions = await architectHost.getOptionsForTarget(target);
     if (!targetOptions) {
@@ -18,7 +25,7 @@ async function localesForTarget(dir, architectHost, target, workspaceProject) {
     let locales = undefined;
     let defaultLocale = undefined;
     if (targetOptions.localize) {
-        const i18n = (_a = workspaceProject.extensions) === null || _a === void 0 ? void 0 : _a.i18n;
+        const i18n = workspaceProject.extensions?.i18n;
         if (!i18n)
             throw new error_1.FirebaseError(`No i18n config on project.`);
         if (typeof i18n.sourceLocale === "string") {
@@ -64,7 +71,7 @@ var BuilderType;
     BuilderType["BROWSER_ESBUILD"] = "browser-esbuild";
     BuilderType["APPLICATION"] = "application";
     BuilderType["PRERENDER"] = "prerender";
-})(BuilderType = exports.BuilderType || (exports.BuilderType = {}));
+})(BuilderType || (exports.BuilderType = BuilderType = {}));
 const DEV_SERVER_TARGETS = [BuilderType.DEV_SERVER, BuilderType.SSR_DEV_SERVER];
 function getValidBuilderTypes(purpose) {
     return [
@@ -106,7 +113,6 @@ async function getAllTargets(purpose, dir) {
     });
     return targets;
 }
-exports.getAllTargets = getAllTargets;
 async function getContext(dir, targetOrConfiguration) {
     const [{ NodeJsAsyncHost }, { workspaces }, { WorkspaceNodeModulesArchitectHost }, { Architect, targetFromTargetString, targetStringFromTarget }, { parse },] = await Promise.all([
         (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node"),
@@ -196,7 +202,7 @@ async function getContext(dir, targetOrConfiguration) {
     if (deployTarget) {
         const options = await architectHost
             .getOptionsForTarget(deployTarget)
-            .catch(() => { var _a; return (_a = workspaceProject.targets.get(deployTarget.target)) === null || _a === void 0 ? void 0 : _a.options; });
+            .catch(() => workspaceProject.targets.get(deployTarget.target)?.options);
         if (!options)
             throw new error_1.FirebaseError("Unable to get options for ng-deploy.");
         if (options.buildTarget) {
@@ -227,10 +233,10 @@ async function getContext(dir, targetOrConfiguration) {
             if (!browserTarget) {
                 throw new error_1.FirebaseError("ng-deploy with prerenderTarget requires a browserTarget");
             }
-            if (targetStringFromTarget(browserTarget) !== (prerenderOptions === null || prerenderOptions === void 0 ? void 0 : prerenderOptions.browserTarget)) {
+            if (targetStringFromTarget(browserTarget) !== prerenderOptions?.browserTarget) {
                 throw new error_1.FirebaseError("ng-deploy's browserTarget and prerender's browserTarget do not match. Please check your angular.json");
             }
-            if (serverTarget && targetStringFromTarget(serverTarget) !== (prerenderOptions === null || prerenderOptions === void 0 ? void 0 : prerenderOptions.serverTarget)) {
+            if (serverTarget && targetStringFromTarget(serverTarget) !== prerenderOptions?.serverTarget) {
                 throw new error_1.FirebaseError("ng-deploy's serverTarget and prerender's serverTarget do not match. Please check your angular.json");
             }
             if (!serverTarget) {
@@ -250,9 +256,9 @@ async function getContext(dir, targetOrConfiguration) {
                 configuration: configuration || defaultConfiguration,
             };
             const options = await architectHost.getOptionsForTarget(prerenderTarget);
-            (0, utils_2.assertIsString)(options === null || options === void 0 ? void 0 : options.browserTarget);
+            (0, utils_2.assertIsString)(options?.browserTarget);
             browserTarget = targetFromTargetString(options.browserTarget);
-            (0, utils_2.assertIsString)(options === null || options === void 0 ? void 0 : options.serverTarget);
+            (0, utils_2.assertIsString)(options?.serverTarget);
             serverTarget = targetFromTargetString(options.serverTarget);
         }
         if (!buildTarget && !browserTarget && workspaceProject.targets.has("build")) {
@@ -353,7 +359,7 @@ async function getContext(dir, targetOrConfiguration) {
     const baseHref = browserTargetOptions.baseHref || "/";
     (0, utils_2.assertIsString)(baseHref);
     const buildTargetOptions = buildTarget && (await tryToGetOptionsForTarget(architectHost, buildTarget));
-    const ssr = buildTarget ? !!(buildTargetOptions === null || buildTargetOptions === void 0 ? void 0 : buildTargetOptions.ssr) : !!serverTarget;
+    const ssr = buildTarget ? !!buildTargetOptions?.ssr : !!serverTarget;
     return {
         architect,
         architectHost,
@@ -369,7 +375,6 @@ async function getContext(dir, targetOrConfiguration) {
         ssr,
     };
 }
-exports.getContext = getContext;
 async function getBrowserConfig(sourceDir, configuration) {
     const { architectHost, browserTarget, buildTarget, baseHref, workspaceProject } = await getContext(sourceDir, configuration);
     const buildOrBrowserTarget = buildTarget || browserTarget;
@@ -381,22 +386,20 @@ async function getBrowserConfig(sourceDir, configuration) {
         architectHost.getOptionsForTarget(buildOrBrowserTarget),
         architectHost.getBuilderNameForTarget(buildOrBrowserTarget),
     ]);
-    const buildOutputPath = typeof (targetOptions === null || targetOptions === void 0 ? void 0 : targetOptions.outputPath) === "string"
+    const buildOutputPath = typeof targetOptions?.outputPath === "string"
         ? targetOptions.outputPath
         : (0, path_1.join)("dist", buildOrBrowserTarget.project);
     const outputPath = (0, path_1.join)(buildOutputPath, buildTarget && getBuilderType(builderName) === BuilderType.APPLICATION ? "browser" : "");
     return { locales, baseHref, outputPath, defaultLocale };
 }
-exports.getBrowserConfig = getBrowserConfig;
 async function getServerConfig(sourceDir, configuration) {
-    var _a;
     const { architectHost, host, buildTarget, serverTarget, browserTarget, baseHref, workspaceProject, serveOptimizedImages, ssr, } = await getContext(sourceDir, configuration);
     const buildOrBrowserTarget = buildTarget || browserTarget;
     if (!buildOrBrowserTarget) {
         throw new assert_1.AssertionError({ message: "expected build or browser target to be defined" });
     }
     const browserTargetOptions = await architectHost.getOptionsForTarget(buildOrBrowserTarget);
-    const buildOutputPath = typeof (browserTargetOptions === null || browserTargetOptions === void 0 ? void 0 : browserTargetOptions.outputPath) === "string"
+    const buildOutputPath = typeof browserTargetOptions?.outputPath === "string"
         ? browserTargetOptions.outputPath
         : (0, path_1.join)("dist", buildOrBrowserTarget.project);
     const browserOutputPath = (0, path_1.join)(buildOutputPath, buildTarget ? "browser" : "")
@@ -428,7 +431,7 @@ async function getServerConfig(sourceDir, configuration) {
             message: `expected "JsonObject" but got "${typeof serverTargetOptions}"`,
         });
     }
-    const serverTargetOutputPath = typeof (serverTargetOptions === null || serverTargetOptions === void 0 ? void 0 : serverTargetOptions.outputPath) === "string"
+    const serverTargetOutputPath = typeof serverTargetOptions?.outputPath === "string"
         ? serverTargetOptions.outputPath
         : (0, path_1.join)("dist", buildOrServerTarget.project);
     const serverOutputPath = (0, path_1.join)(serverTargetOutputPath, buildTarget ? "server" : "")
@@ -439,7 +442,7 @@ async function getServerConfig(sourceDir, configuration) {
     }
     const serverEntry = buildTarget ? "server.mjs" : serverTarget && "main.js";
     const externalDependencies = serverTargetOptions.externalDependencies || [];
-    const bundleDependencies = (_a = serverTargetOptions.bundleDependencies) !== null && _a !== void 0 ? _a : true;
+    const bundleDependencies = serverTargetOptions.bundleDependencies ?? true;
     const { locales: browserLocales } = await localesForTarget(sourceDir, architectHost, buildOrBrowserTarget, workspaceProject);
     return {
         packageJson,
@@ -455,7 +458,6 @@ async function getServerConfig(sourceDir, configuration) {
         serverEntry,
     };
 }
-exports.getServerConfig = getServerConfig;
 async function getBuildConfig(sourceDir, configuration) {
     const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(sourceDir, "@angular-devkit/architect");
     const { buildTarget, browserTarget, baseHref, prerenderTarget, serverTarget, architectHost, workspaceProject, serveOptimizedImages, ssr, } = await getContext(sourceDir, configuration);
@@ -477,7 +479,6 @@ async function getBuildConfig(sourceDir, configuration) {
         ssr,
     };
 }
-exports.getBuildConfig = getBuildConfig;
 function getAngularVersion(cwd) {
     const dependency = (0, utils_1.findDependency)("@angular/core", { cwd, depth: 0, omitDev: false });
     if (!dependency)
@@ -487,11 +488,9 @@ function getAngularVersion(cwd) {
         return dependency.version;
     return angularVersionSemver.toString();
 }
-exports.getAngularVersion = getAngularVersion;
 async function tryToGetOptionsForTarget(architectHost, target) {
     return await architectHost.getOptionsForTarget(target).catch(throwCannotDetermineTarget);
 }
-exports.tryToGetOptionsForTarget = tryToGetOptionsForTarget;
 function throwCannotDetermineTarget(error) {
     throw new error_1.FirebaseError(`Unable to determine the application to deploy, specify a target via the FIREBASE_FRAMEWORKS_BUILD_TARGET environment variable.`, { original: error });
 }
@@ -503,4 +502,3 @@ function getBuilderType(builder) {
     }
     return builderType;
 }
-exports.getBuilderType = getBuilderType;

package/lib/frameworks/astro/index.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.supportedRange = exports.type = exports.support = exports.name = void 0;
+exports.supportedRange = exports.type = exports.support = exports.name = void 0;
+exports.discover = discover;
+exports.build = build;
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
+exports.getDevModeHandle = getDevModeHandle;
 const cross_spawn_1 = require("cross-spawn");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -23,14 +28,13 @@ async function discover(dir) {
         version,
     };
 }
-exports.discover = discover;
 const DEFAULT_BUILD_SCRIPT = ["astro build"];
 async function build(cwd) {
     const cli = (0, utils_1.getNodeModuleBin)("astro", cwd);
     await (0, utils_1.warnIfCustomBuildScript)(cwd, exports.name, DEFAULT_BUILD_SCRIPT);
     const { output, adapter } = await (0, utils_2.getConfig)(cwd);
     const wantsBackend = output !== "static";
-    if (wantsBackend && (adapter === null || adapter === void 0 ? void 0 : adapter.name) !== "@astrojs/node") {
+    if (wantsBackend && adapter?.name !== "@astrojs/node") {
         throw new error_1.FirebaseError("Deploying an Astro application with SSR on Firebase Hosting requires the @astrojs/node adapter in middleware mode. https://docs.astro.build/en/guides/integrations-guide/node/");
     }
     const build = (0, cross_spawn_1.sync)(cli, ["build"], { cwd, stdio: "inherit" });
@@ -38,13 +42,11 @@ async function build(cwd) {
         throw new error_1.FirebaseError("Unable to build your Astro app");
     return { wantsBackend };
 }
-exports.build = build;
 async function ɵcodegenPublicDirectory(root, dest) {
     const { outDir, output } = await (0, utils_2.getConfig)(root);
     const assetPath = (0, path_1.join)(root, outDir, output !== "static" ? "client" : "");
     await (0, fs_extra_1.copy)(assetPath, dest);
 }
-exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     const { outDir } = await (0, utils_2.getConfig)(sourceDir);
     const packageJson = await (0, utils_1.readJSON)((0, path_1.join)(sourceDir, "package.json"));
@@ -54,7 +56,6 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
         bootstrapScript: (0, utils_2.getBootstrapScript)(),
     };
 }
-exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 async function getDevModeHandle(cwd) {
     const host = new Promise((resolve, reject) => {
         const cli = (0, utils_1.getNodeModuleBin)("astro", cwd);
@@ -72,4 +73,3 @@ async function getDevModeHandle(cwd) {
     });
     return (0, utils_1.simpleProxy)(await host);
 }
-exports.getDevModeHandle = getDevModeHandle;

package/lib/frameworks/astro/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAstroVersion = exports.getConfig = exports.getBootstrapScript = void 0;
+exports.getBootstrapScript = getBootstrapScript;
+exports.getConfig = getConfig;
+exports.getAstroVersion = getAstroVersion;
 const path_1 = require("path");
 const utils_1 = require("../utils");
 const semver_1 = require("semver");
@@ -9,7 +11,6 @@ const { dynamicImport } = require(true && "../../dynamicImport");
 function getBootstrapScript() {
     return `const entry = import('./entry.mjs');\nexport const handle = async (req, res) => (await entry).handler(req, res)`;
 }
-exports.getBootstrapScript = getBootstrapScript;
 async function getConfig(cwd) {
     const astroDirectory = (0, path_1.dirname)(require.resolve("astro/package.json", { paths: [cwd] }));
     const version = getAstroVersion(cwd);
@@ -33,9 +34,6 @@ async function getConfig(cwd) {
         adapter: config.adapter,
     };
 }
-exports.getConfig = getConfig;
 function getAstroVersion(cwd) {
-    var _a;
-    return (_a = (0, utils_1.findDependency)("astro", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
+    return (0, utils_1.findDependency)("astro", { cwd, depth: 0, omitDev: false })?.version;
 }
-exports.getAstroVersion = getAstroVersion;

package/lib/frameworks/compose/discover/filesystem.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readOrNull = exports.LocalFileSystem = void 0;
+exports.LocalFileSystem = void 0;
+exports.readOrNull = readOrNull;
 const fs_extra_1 = require("fs-extra");
 const path = require("path");
 const error_1 = require("../../../error");
@@ -42,11 +43,10 @@ async function readOrNull(fs, path) {
         return fs.read(path);
     }
     catch (err) {
-        if (err && typeof err === "object" && (err === null || err === void 0 ? void 0 : err.code) === "ENOENT") {
+        if (err && typeof err === "object" && err?.code === "ENOENT") {
             logger_1.logger.debug("ENOENT error occured while reading file.");
             return null;
         }
         throw new Error(`Unknown error occured while reading file: ${err}`);
     }
 }
-exports.readOrNull = readOrNull;

package/lib/frameworks/compose/discover/frameworkMatcher.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.frameworkMatcher = exports.removeEmbededFrameworks = exports.filterFrameworksWithFiles = exports.filterFrameworksWithDependencies = void 0;
+exports.filterFrameworksWithDependencies = filterFrameworksWithDependencies;
+exports.filterFrameworksWithFiles = filterFrameworksWithFiles;
+exports.removeEmbededFrameworks = removeEmbededFrameworks;
+exports.frameworkMatcher = frameworkMatcher;
 const error_1 = require("../../../error");
 const logger_1 = require("../../../logger");
 function filterFrameworksWithDependencies(allFrameworkSpecs, dependencies) {
@@ -10,7 +13,6 @@ function filterFrameworksWithDependencies(allFrameworkSpecs, dependencies) {
         });
     });
 }
-exports.filterFrameworksWithDependencies = filterFrameworksWithDependencies;
 async function filterFrameworksWithFiles(allFrameworkSpecs, fs) {
     try {
         const filteredFrameworks = [];
@@ -40,7 +42,6 @@ async function filterFrameworksWithFiles(allFrameworkSpecs, fs) {
         throw error;
     }
 }
-exports.filterFrameworksWithFiles = filterFrameworksWithFiles;
 function removeEmbededFrameworks(allFrameworkSpecs) {
     const embededFrameworkSet = new Set();
     for (const framework of allFrameworkSpecs) {
@@ -53,7 +54,6 @@ function removeEmbededFrameworks(allFrameworkSpecs) {
     }
     return allFrameworkSpecs.filter((item) => !embededFrameworkSet.has(item.id));
 }
-exports.removeEmbededFrameworks = removeEmbededFrameworks;
 async function frameworkMatcher(runtime, fs, frameworks, dependencies) {
     try {
         const filterRuntimeFramework = frameworks.filter((framework) => framework.runtime === runtime);
@@ -73,4 +73,3 @@ async function frameworkMatcher(runtime, fs, frameworks, dependencies) {
         throw new error_1.FirebaseError(`Failed to match the correct framework: ${error}`);
     }
 }
-exports.frameworkMatcher = frameworkMatcher;

package/lib/frameworks/compose/discover/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.discover = void 0;
+exports.discover = discover;
 const node_1 = require("./runtime/node");
 const error_1 = require("../../../error");
 const supportedRuntimes = [new node_1.NodejsRuntime()];
@@ -29,4 +29,3 @@ async function discover(fs, allFrameworkSpecs) {
         throw new error_1.FirebaseError(`Failed to identify required specifications to execute the application: ${error}`);
     }
 }
-exports.discover = discover;

package/lib/frameworks/compose/discover/runtime/node.js

@@ -44,7 +44,7 @@ class NodejsRuntime {
         }
     }
     getDependencies(packageJSON) {
-        return Object.assign(Object.assign({}, packageJSON.dependencies), packageJSON.devDependencies);
+        return { ...packageJSON.dependencies, ...packageJSON.devDependencies };
     }
     packageManagerInstallCommand(packageManager) {
         const packages = [];
@@ -80,40 +80,37 @@ class NodejsRuntime {
         return command;
     }
     getBuildCommand(packageManager, scripts, matchedFramework) {
-        var _a;
         let buildCommand = { cmd: "" };
-        if (scripts === null || scripts === void 0 ? void 0 : scripts.build) {
+        if (scripts?.build) {
             buildCommand.cmd = this.executeScript(packageManager, "build");
         }
-        else if (matchedFramework && ((_a = matchedFramework.commands) === null || _a === void 0 ? void 0 : _a.build)) {
+        else if (matchedFramework && matchedFramework.commands?.build) {
             buildCommand = matchedFramework.commands.build;
             buildCommand = this.executeFrameworkCommand(packageManager, buildCommand);
         }
         return buildCommand.cmd === "" ? undefined : buildCommand;
     }
     getDevCommand(packageManager, scripts, matchedFramework) {
-        var _a;
         let devCommand = { cmd: "", env: { NODE_ENV: "dev" } };
-        if (scripts === null || scripts === void 0 ? void 0 : scripts.dev) {
+        if (scripts?.dev) {
             devCommand.cmd = this.executeScript(packageManager, "dev");
         }
-        else if (matchedFramework && ((_a = matchedFramework.commands) === null || _a === void 0 ? void 0 : _a.dev)) {
+        else if (matchedFramework && matchedFramework.commands?.dev) {
             devCommand = matchedFramework.commands.dev;
             devCommand = this.executeFrameworkCommand(packageManager, devCommand);
         }
         return devCommand.cmd === "" ? undefined : devCommand;
     }
     async getRunCommand(packageManager, scripts, matchedFramework, fs) {
-        var _a;
         let runCommand = { cmd: "", env: { NODE_ENV: "production" } };
-        if (scripts === null || scripts === void 0 ? void 0 : scripts.start) {
+        if (scripts?.start) {
             runCommand.cmd = this.executeScript(packageManager, "start");
         }
-        else if (matchedFramework && ((_a = matchedFramework.commands) === null || _a === void 0 ? void 0 : _a.run)) {
+        else if (matchedFramework && matchedFramework.commands?.run) {
             runCommand = matchedFramework.commands.run;
             runCommand = this.executeFrameworkCommand(packageManager, runCommand);
         }
-        else if (scripts === null || scripts === void 0 ? void 0 : scripts.main) {
+        else if (scripts?.main) {
             runCommand.cmd = `node ${scripts.main}`;
         }
         else if (await fs.exists("index.js")) {

package/lib/frameworks/compose/driver/docker.js

@@ -100,7 +100,7 @@ class DockerDriver {
         console.log(`executing docker build: ${args.join(" ")} ${contextDir}`);
         console.log(this.dockerfileBuilder.toString());
         return spawn.sync("docker", ["buildx", "build", ...args, "-f", "-", contextDir], {
-            env: Object.assign(Object.assign({}, process.env), this.spec.environmentVariables),
+            env: { ...process.env, ...this.spec.environmentVariables },
             input: this.dockerfileBuilder.toString(),
             stdio: ["pipe", "inherit", "inherit"],
         });
@@ -142,8 +142,7 @@ class DockerDriver {
         }
     }
     build() {
-        var _a;
-        if ((_a = this.spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.build) {
+        if (this.spec.detectedCommands?.build) {
             this.dockerfileBuilder
                 .fromLastStage(DOCKER_STAGE_BUILD)
                 .copyForFirebase(".", ".")
@@ -152,8 +151,7 @@ class DockerDriver {
         }
     }
     export(bundle) {
-        var _a;
-        const startCmd = (_a = bundle.server) === null || _a === void 0 ? void 0 : _a.start.cmd;
+        const startCmd = bundle.server?.start.cmd;
         if (startCmd) {
             const exportStage = "exporter";
             this.dockerfileBuilder

package/lib/frameworks/compose/driver/hooks.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genHookScript = exports.BUNDLE_PATH = void 0;
+exports.BUNDLE_PATH = void 0;
+exports.genHookScript = genHookScript;
 exports.BUNDLE_PATH = "/home/firebase/app/.firebase/.output/bundle.json";
 function genHookScript(bundle, hook) {
     let hookSrc = hook.toString().trimLeft();
@@ -19,4 +20,3 @@ const bundle = (${hookSrc})(${JSON.stringify(bundle)});
 fs.writeFileSync("${exports.BUNDLE_PATH}", JSON.stringify(bundle));
 `;
 }
-exports.genHookScript = genHookScript;

package/lib/frameworks/compose/driver/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDriver = exports.SUPPORTED_MODES = void 0;
+exports.SUPPORTED_MODES = void 0;
+exports.getDriver = getDriver;
 const local_1 = require("./local");
 const docker_1 = require("./docker");
 exports.SUPPORTED_MODES = ["local", "docker"];
@@ -13,4 +14,3 @@ function getDriver(mode, app) {
     }
     throw new Error(`Unsupported mode ${mode}`);
 }
-exports.getDriver = getDriver;

package/lib/frameworks/compose/driver/local.js

@@ -10,7 +10,7 @@ class LocalDriver {
     }
     execCmd(cmd, args) {
         const ret = spawn.sync(cmd, args, {
-            env: Object.assign(Object.assign({}, process.env), this.spec.environmentVariables),
+            env: { ...process.env, ...this.spec.environmentVariables },
             stdio: ["pipe", "inherit", "inherit"],
         });
         if (ret.error) {
@@ -28,8 +28,7 @@ class LocalDriver {
         }
     }
     build() {
-        var _a;
-        if ((_a = this.spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.build) {
+        if (this.spec.detectedCommands?.build) {
             const [cmd, ...args] = this.spec.detectedCommands.build.cmd.split(" ");
             this.execCmd(cmd, args);
         }