firebase-tools 12.9.1 → 13.0.0

package/lib/frameworks/angular/utils.js

@@ -4,12 +4,16 @@ exports.getBuildConfig = exports.getServerConfig = exports.getBrowserConfig = ex
 const utils_1 = require("../utils");
 const error_1 = require("../../error");
 const path_1 = require("path");
+const assert_1 = require("assert");
+const utils_2 = require("../../utils");
 async function localesForTarget(dir, architectHost, target, workspaceProject) {
     var _a;
     const { targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
     const targetOptions = await architectHost.getOptionsForTarget(target);
-    if (!targetOptions)
-        throw new error_1.FirebaseError(`Couldn't find options for ${targetStringFromTarget(target)}.`);
+    if (!targetOptions) {
+        const targetString = targetStringFromTarget(target);
+        throw new error_1.FirebaseError(`Couldn't find options for ${targetString}.`);
+    }
     let locales = undefined;
     let defaultLocale = undefined;
     if (targetOptions.localize) {
@@ -52,11 +56,15 @@ async function localesForTarget(dir, architectHost, target, workspaceProject) {
 const DEV_SERVER_TARGETS = [
     "@angular-devkit/build-angular:dev-server",
     "@nguniversal/builders:ssr-dev-server",
+    "@angular-devkit/build-angular:ssr-dev-server",
 ];
 function getValidBuilders(purpose) {
     return [
+        "@angular-devkit/build-angular:application",
+        "@angular-devkit/build-angular:browser-esbuild",
         "@angular/fire:deploy",
         "@angular-devkit/build-angular:browser",
+        "@angular-devkit/build-angular:prerender",
         "@nguniversal/builders:prerender",
         ...(purpose === "deploy" ? [] : DEV_SERVER_TARGETS),
     ];
@@ -99,13 +107,14 @@ async function getContext(dir, targetOrConfiguration) {
     const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, dir);
     const architect = new Architect(architectHost);
     let overrideTarget;
+    let deployTarget;
     let project;
+    let buildTarget;
     let browserTarget;
     let serverTarget;
     let prerenderTarget;
     let serveTarget;
     let serveOptimizedImages = false;
-    let deployTargetName;
     let configuration = undefined;
     if (targetOrConfiguration) {
         try {
@@ -114,7 +123,6 @@ async function getContext(dir, targetOrConfiguration) {
             project = overrideTarget.project;
         }
         catch (e) {
-            deployTargetName = "deploy";
             configuration = targetOrConfiguration;
         }
     }
@@ -139,136 +147,233 @@ async function getContext(dir, targetOrConfiguration) {
     if (overrideTarget) {
         const target = workspaceProject.targets.get(overrideTarget.target);
         const builder = target.builder;
-        if (builder === "@angular/fire:deploy")
-            deployTargetName = overrideTarget.target;
-        if (builder === "@angular-devkit/build-angular:browser")
-            browserTarget = overrideTarget;
-        if (builder === "@nguniversal/builders:prerender")
-            prerenderTarget = overrideTarget;
-        if (typeof builder === "string" && DEV_SERVER_TARGETS.includes(builder))
-            serveTarget = overrideTarget;
+        switch (builder) {
+            case "@angular/fire:deploy":
+                deployTarget = overrideTarget;
+                break;
+            case "@angular-devkit/build-angular:application":
+                buildTarget = overrideTarget;
+                break;
+            case "@angular-devkit/build-angular:browser-esbuild":
+            case "@angular-devkit/build-angular:browser":
+                browserTarget = overrideTarget;
+                break;
+            case "@angular-devkit/build-angular:prerender":
+            case "@nguniversal/builders:prerender":
+                prerenderTarget = overrideTarget;
+                break;
+            case "@angular-devkit/build-angular:dev-server":
+            case "@nguniversal/builders:ssr-dev-server":
+            case "@angular-devkit/build-angular:ssr-dev-server":
+                serveTarget = overrideTarget;
+                break;
+            default:
+                throw new error_1.FirebaseError(`builder ${builder} not known.`);
+        }
     }
-    const deployTargetDefinition = deployTargetName
-        ? workspaceProject.targets.get(deployTargetName)
-        : undefined;
-    if ((deployTargetDefinition === null || deployTargetDefinition === void 0 ? void 0 : deployTargetDefinition.builder) === "@angular/fire:deploy") {
-        const options = deployTargetDefinition.options;
-        if (typeof (options === null || options === void 0 ? void 0 : options.prerenderTarget) === "string")
+    else if (workspaceProject.targets.has("deploy")) {
+        const { builder, defaultConfiguration = "production" } = workspaceProject.targets.get("deploy");
+        if (builder === "@angular/fire:deploy") {
+            deployTarget = {
+                project,
+                target: "deploy",
+                configuration: configuration || defaultConfiguration,
+            };
+        }
+    }
+    if (deployTarget) {
+        const options = await architectHost.getOptionsForTarget(deployTarget);
+        if (!options)
+            throw new error_1.FirebaseError("Unable to get options for ng-deploy.");
+        if (options.buildTarget) {
+            (0, utils_2.assertIsString)(options.buildTarget);
+            buildTarget = targetFromTargetString(options.buildTarget);
+        }
+        if (options.prerenderTarget) {
+            (0, utils_2.assertIsString)(options.prerenderTarget);
             prerenderTarget = targetFromTargetString(options.prerenderTarget);
-        if (typeof (options === null || options === void 0 ? void 0 : options.browserTarget) === "string")
+        }
+        if (options.browserTarget) {
+            (0, utils_2.assertIsString)(options.browserTarget);
             browserTarget = targetFromTargetString(options.browserTarget);
-        if (typeof (options === null || options === void 0 ? void 0 : options.serverTarget) === "string")
+        }
+        if (options.serverTarget) {
+            (0, utils_2.assertIsString)(options.serverTarget);
             serverTarget = targetFromTargetString(options.serverTarget);
-        if (options === null || options === void 0 ? void 0 : options.serveOptimizedImages) {
+        }
+        if (options.serveOptimizedImages) {
             serveOptimizedImages = true;
         }
-        if (!browserTarget)
-            throw new Error("ng-deploy is missing a browser target. Plase check your angular.json.");
         if (prerenderTarget) {
             const prerenderOptions = await architectHost.getOptionsForTarget(prerenderTarget);
-            if (targetStringFromTarget(browserTarget) !== (prerenderOptions === null || prerenderOptions === void 0 ? void 0 : prerenderOptions.browserTarget))
-                throw new Error("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))
-                throw new Error("ng-deploy's serverTarget and prerender's serverTarget do not match. Please check your angular.json");
-            if (!serverTarget)
+            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)) {
+                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)) {
+                throw new error_1.FirebaseError("ng-deploy's serverTarget and prerender's serverTarget do not match. Please check your angular.json");
+            }
+            if (!serverTarget) {
                 console.warn("Treating the application as fully rendered. Add a serverTarget to your deploy target in angular.json to utilize server-side rendering.");
+            }
+        }
+        if (!buildTarget && !browserTarget) {
+            throw new error_1.FirebaseError("ng-deploy is missing a build target. Plase check your angular.json.");
         }
     }
-    if (!overrideTarget && !prerenderTarget && workspaceProject.targets.has("prerender")) {
-        const { defaultConfiguration = "production" } = workspaceProject.targets.get("prerender");
-        prerenderTarget = { project, target: "prerender", configuration: defaultConfiguration };
-    }
-    if (serveTarget) {
-        const options = await architectHost.getOptionsForTarget(serveTarget);
-        if (typeof (options === null || options === void 0 ? void 0 : options.browserTarget) !== "string")
-            throw new Error(`${serveTarget.target} browserTarget expected to be string, check your angular.json.`);
-        browserTarget = targetFromTargetString(options.browserTarget);
-        if (options === null || options === void 0 ? void 0 : options.serverTarget) {
-            if (typeof options.serverTarget !== "string")
-                throw new Error(`${serveTarget.target} serverTarget expected to be string, check your angular.json.`);
+    else if (!overrideTarget) {
+        if (workspaceProject.targets.has("prerender")) {
+            const { defaultConfiguration = "production" } = workspaceProject.targets.get("prerender");
+            prerenderTarget = {
+                project,
+                target: "prerender",
+                configuration: configuration || defaultConfiguration,
+            };
+            const options = await architectHost.getOptionsForTarget(prerenderTarget);
+            (0, utils_2.assertIsString)(options === null || options === void 0 ? void 0 : options.browserTarget);
+            browserTarget = targetFromTargetString(options.browserTarget);
+            (0, utils_2.assertIsString)(options === null || options === void 0 ? void 0 : options.serverTarget);
             serverTarget = targetFromTargetString(options.serverTarget);
         }
-    }
-    else if (prerenderTarget) {
-        const options = await architectHost.getOptionsForTarget(prerenderTarget);
-        if (typeof (options === null || options === void 0 ? void 0 : options.browserTarget) !== "string")
-            throw new Error("Prerender browserTarget expected to be string, check your angular.json.");
-        browserTarget = targetFromTargetString(options.browserTarget);
-        if (typeof (options === null || options === void 0 ? void 0 : options.serverTarget) !== "string")
-            throw new Error("Prerender serverTarget expected to be string, check your angular.json.");
-        serverTarget = targetFromTargetString(options.serverTarget);
-    }
-    if (!browserTarget && workspaceProject.targets.has("build")) {
-        const { defaultConfiguration = "production" } = workspaceProject.targets.get("build");
-        browserTarget = { project, target: "build", configuration: defaultConfiguration };
-    }
-    if (!serverTarget && workspaceProject.targets.has("server")) {
-        const { defaultConfiguration = "production" } = workspaceProject.targets.get("server");
-        serverTarget = { project, target: "server", configuration: defaultConfiguration };
+        if (!buildTarget && !browserTarget && workspaceProject.targets.has("build")) {
+            const { builder, defaultConfiguration = "production" } = workspaceProject.targets.get("build");
+            const target = {
+                project,
+                target: "build",
+                configuration: configuration || defaultConfiguration,
+            };
+            if (builder === "@angular-devkit/build-angular:browser" ||
+                builder === "@angular-devkit/build-angular:browser-esbuild") {
+                browserTarget = target;
+            }
+            else {
+                buildTarget = target;
+            }
+        }
+        if (!serverTarget && workspaceProject.targets.has("server")) {
+            const { defaultConfiguration = "production" } = workspaceProject.targets.get("server");
+            serverTarget = {
+                project,
+                target: "server",
+                configuration: configuration || defaultConfiguration,
+            };
+        }
     }
     if (!serveTarget) {
         if (serverTarget && workspaceProject.targets.has("serve-ssr")) {
             const { defaultConfiguration = "development" } = workspaceProject.targets.get("serve-ssr");
-            serveTarget = { project, target: "serve-ssr", configuration: defaultConfiguration };
+            serveTarget = {
+                project,
+                target: "serve-ssr",
+                configuration: configuration || defaultConfiguration,
+            };
         }
         else if (workspaceProject.targets.has("serve")) {
             const { defaultConfiguration = "development" } = workspaceProject.targets.get("serve");
-            serveTarget = { project, target: "serve", configuration: defaultConfiguration };
+            serveTarget = {
+                project,
+                target: "serve",
+                configuration: configuration || defaultConfiguration,
+            };
         }
     }
-    if (configuration) {
-        if (prerenderTarget)
-            prerenderTarget.configuration = configuration;
-        if (serverTarget)
-            serverTarget.configuration = configuration;
-        if (browserTarget)
-            browserTarget.configuration = configuration;
-        if (serveTarget)
-            serveTarget.configuration = configuration;
+    for (const target of [
+        deployTarget,
+        buildTarget,
+        prerenderTarget,
+        serverTarget,
+        browserTarget,
+        serveTarget,
+    ]) {
+        if (target) {
+            const targetString = targetStringFromTarget(target);
+            if (target.project !== project)
+                throw new error_1.FirebaseError(`${targetString} is not in project ${project}. Please check your angular.json`);
+            const definition = workspaceProject.targets.get(target.target);
+            if (!definition)
+                throw new error_1.FirebaseError(`${target} could not be found in your angular.json`);
+            const { builder } = definition;
+            if (target === deployTarget && builder === "@angular/fire:deploy")
+                continue;
+            if (target === buildTarget && builder === "@angular-devkit/build-angular:application")
+                continue;
+            if (target === browserTarget && builder === "@angular-devkit/build-angular:browser-esbuild")
+                continue;
+            if (target === browserTarget && builder === "@angular-devkit/build-angular:browser")
+                continue;
+            if (target === prerenderTarget && builder === "@angular-devkit/build-angular:prerender")
+                continue;
+            if (target === prerenderTarget && builder === "@nguniversal/builders:prerender")
+                continue;
+            if (target === serverTarget && builder === "@angular-devkit/build-angular:server")
+                continue;
+            if (target === serveTarget && builder === "@nguniversal/builders:ssr-dev-server")
+                continue;
+            if (target === serveTarget && builder === "@angular-devkit/build-angular:ssr-dev-server")
+                continue;
+            if (target === serveTarget && builder === "@angular-devkit/build-angular:dev-server")
+                continue;
+            throw new error_1.FirebaseError(`${definition.builder} (${targetString}) is not a recognized builder. Please check your angular.json`);
+        }
+    }
+    const buildOrBrowserTarget = buildTarget || browserTarget;
+    if (!buildOrBrowserTarget) {
+        throw new error_1.FirebaseError(`No build target on ${project}`);
     }
-    if (!browserTarget)
-        throw new error_1.FirebaseError(`No browser target on ${project}`);
-    const browserTargetOptions = await architectHost.getOptionsForTarget(browserTarget);
+    const browserTargetOptions = await architectHost.getOptionsForTarget(buildOrBrowserTarget);
     if (!browserTargetOptions) {
-        throw new error_1.FirebaseError(`Couldn't find options for ${targetStringFromTarget(browserTarget)}.`);
+        const targetString = targetStringFromTarget(buildOrBrowserTarget);
+        throw new error_1.FirebaseError(`Couldn't find options for ${targetString}.`);
     }
     const baseHref = browserTargetOptions.baseHref || "/";
-    if (typeof baseHref !== "string") {
-        throw new error_1.FirebaseError(`baseHref on ${targetStringFromTarget(browserTarget)} was not a string`);
-    }
+    (0, utils_2.assertIsString)(baseHref);
+    const buildTargetOptions = buildTarget && (await architectHost.getOptionsForTarget(buildTarget));
+    const ssr = buildTarget ? !!(buildTargetOptions === null || buildTargetOptions === void 0 ? void 0 : buildTargetOptions.ssr) : !!serverTarget;
     return {
         architect,
         architectHost,
         baseHref,
         host,
+        buildTarget,
         browserTarget,
         prerenderTarget,
         serverTarget,
         serveTarget,
         workspaceProject,
         serveOptimizedImages,
+        ssr,
     };
 }
 exports.getContext = getContext;
 async function getBrowserConfig(sourceDir, configuration) {
-    const { architectHost, browserTarget, baseHref, workspaceProject } = await getContext(sourceDir, configuration);
-    const { locales, defaultLocale } = await localesForTarget(sourceDir, architectHost, browserTarget, workspaceProject);
-    const browserTargetOptions = await architectHost.getOptionsForTarget(browserTarget);
-    if (typeof (browserTargetOptions === null || browserTargetOptions === void 0 ? void 0 : browserTargetOptions.outputPath) !== "string")
-        throw new Error("browserTarget output path is not a string");
-    const outputPath = browserTargetOptions.outputPath;
+    const { architectHost, browserTarget, buildTarget, baseHref, workspaceProject } = await getContext(sourceDir, configuration);
+    const buildOrBrowserTarget = buildTarget || browserTarget;
+    if (!buildOrBrowserTarget) {
+        throw new assert_1.AssertionError({ message: "expected build or browser target defined" });
+    }
+    const { locales, defaultLocale } = await localesForTarget(sourceDir, architectHost, buildOrBrowserTarget, workspaceProject);
+    const targetOptions = await architectHost.getOptionsForTarget(buildOrBrowserTarget);
+    (0, utils_2.assertIsString)(targetOptions === null || targetOptions === void 0 ? void 0 : targetOptions.outputPath);
+    const outputPath = (0, path_1.join)(targetOptions.outputPath, buildTarget ? "browser" : "");
     return { locales, baseHref, outputPath, defaultLocale };
 }
 exports.getBrowserConfig = getBrowserConfig;
 async function getServerConfig(sourceDir, configuration) {
     var _a;
-    const { architectHost, host, serverTarget, browserTarget, baseHref, workspaceProject, serveOptimizedImages, } = await getContext(sourceDir, configuration);
-    const browserTargetOptions = await architectHost.getOptionsForTarget(browserTarget);
-    if (typeof (browserTargetOptions === null || browserTargetOptions === void 0 ? void 0 : browserTargetOptions.outputPath) !== "string")
-        throw new Error("browserTarget output path is not a string");
-    const browserOutputPath = browserTargetOptions.outputPath;
+    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);
+    (0, utils_2.assertIsString)(browserTargetOptions === null || browserTargetOptions === void 0 ? void 0 : browserTargetOptions.outputPath);
+    const browserOutputPath = (0, path_1.join)(browserTargetOptions.outputPath, buildTarget ? "browser" : "")
+        .split(path_1.sep)
+        .join(path_1.posix.sep);
     const packageJson = JSON.parse(await host.readFile((0, path_1.join)(sourceDir, "package.json")));
-    if (!serverTarget) {
+    if (!ssr) {
         return {
             packageJson,
             browserOutputPath,
@@ -282,17 +387,23 @@ async function getServerConfig(sourceDir, configuration) {
             serveOptimizedImages,
         };
     }
-    const { locales: serverLocales, defaultLocale } = await localesForTarget(sourceDir, architectHost, serverTarget, workspaceProject);
-    const serverTargetOptions = await architectHost.getOptionsForTarget(serverTarget);
-    if (typeof (serverTargetOptions === null || serverTargetOptions === void 0 ? void 0 : serverTargetOptions.outputPath) !== "string")
-        throw new Error("serverTarget output path is not a string");
-    const serverOutputPath = serverTargetOptions.outputPath;
+    const buildOrServerTarget = buildTarget || serverTarget;
+    if (!buildOrServerTarget) {
+        throw new assert_1.AssertionError({ message: "expected build or server target to be defined" });
+    }
+    const { locales: serverLocales, defaultLocale } = await localesForTarget(sourceDir, architectHost, buildOrServerTarget, workspaceProject);
+    const serverTargetOptions = await architectHost.getOptionsForTarget(buildOrServerTarget);
+    (0, utils_2.assertIsString)(serverTargetOptions === null || serverTargetOptions === void 0 ? void 0 : serverTargetOptions.outputPath);
+    const serverOutputPath = (0, path_1.join)(serverTargetOptions.outputPath, buildTarget ? "server" : "")
+        .split(path_1.sep)
+        .join(path_1.posix.sep);
     if (serverLocales && !defaultLocale) {
         throw new error_1.FirebaseError("It's required that your source locale to be one of the localize options");
     }
+    const serverEntry = buildTarget ? "server.mjs" : serverTarget && "main.js";
     const externalDependencies = serverTargetOptions.externalDependencies || [];
     const bundleDependencies = (_a = serverTargetOptions.bundleDependencies) !== null && _a !== void 0 ? _a : true;
-    const { locales: browserLocales } = await localesForTarget(sourceDir, architectHost, browserTarget, workspaceProject);
+    const { locales: browserLocales } = await localesForTarget(sourceDir, architectHost, buildOrBrowserTarget, workspaceProject);
     return {
         packageJson,
         browserOutputPath,
@@ -304,20 +415,29 @@ async function getServerConfig(sourceDir, configuration) {
         browserLocales,
         defaultLocale,
         serveOptimizedImages,
+        serverEntry,
     };
 }
 exports.getServerConfig = getServerConfig;
 async function getBuildConfig(sourceDir, configuration) {
     const { targetStringFromTarget } = (0, utils_1.relativeRequire)(sourceDir, "@angular-devkit/architect");
-    const { browserTarget, baseHref, prerenderTarget, serverTarget, architectHost, workspaceProject, serveOptimizedImages, } = await getContext(sourceDir, configuration);
-    const targets = (prerenderTarget ? [prerenderTarget] : [browserTarget, serverTarget].filter((it) => !!it)).map((it) => targetStringFromTarget(it));
-    const locales = await localesForTarget(sourceDir, architectHost, browserTarget, workspaceProject);
+    const { buildTarget, browserTarget, baseHref, prerenderTarget, serverTarget, architectHost, workspaceProject, serveOptimizedImages, ssr, } = await getContext(sourceDir, configuration);
+    const targets = (buildTarget
+        ? [buildTarget]
+        : prerenderTarget
+            ? [prerenderTarget]
+            : [browserTarget, serverTarget].filter((it) => !!it)).map((it) => targetStringFromTarget(it));
+    const buildOrBrowserTarget = buildTarget || browserTarget;
+    if (!buildOrBrowserTarget) {
+        throw new assert_1.AssertionError({ message: "expected build or browser target defined" });
+    }
+    const locales = await localesForTarget(sourceDir, architectHost, buildOrBrowserTarget, workspaceProject);
     return {
         targets,
         baseHref,
-        serverTarget,
         locales,
         serveOptimizedImages,
+        ssr,
     };
 }
 exports.getBuildConfig = getBuildConfig;

package/lib/frameworks/constants.js

@@ -2,6 +2,7 @@
 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;
 const clc = require("colorette");
+const experiments = require("../experiments");
 exports.NPM_COMMAND_TIMEOUT_MILLIES = 10000;
 exports.SupportLevelWarnings = {
     ["experimental"]: (framework) => `Thank you for trying our ${clc.italic("experimental")} support for ${framework} on Firebase Hosting.
@@ -14,9 +15,11 @@ exports.DEFAULT_DOCS_URL = "https://firebase.google.com/docs/hosting/frameworks/
 exports.FILE_BUG_URL = "https://github.com/firebase/firebase-tools/issues/new?template=bug_report.md";
 exports.FEATURE_REQUEST_URL = "https://github.com/firebase/firebase-tools/issues/new?template=feature_request.md";
 exports.MAILING_LIST_URL = "https://goo.gle/41enW5X";
-exports.FIREBASE_FRAMEWORKS_VERSION = "^0.10.4";
-exports.FIREBASE_FUNCTIONS_VERSION = "^4.3.0";
-exports.FIREBASE_ADMIN_VERSION = "^11.0.1";
+const DEFAULT_FIREBASE_FRAMEWORKS_VERSION = "^0.11.0";
+exports.FIREBASE_FRAMEWORKS_VERSION = (experiments.isEnabled("internaltesting") && process.env.FIREBASE_FRAMEWORKS_VERSION) ||
+    DEFAULT_FIREBASE_FRAMEWORKS_VERSION;
+exports.FIREBASE_FUNCTIONS_VERSION = "^4.5.0";
+exports.FIREBASE_ADMIN_VERSION = "^11.11.1";
 exports.SHARP_VERSION = "^0.32.1";
 exports.NODE_VERSION = parseInt(process.versions.node, 10);
 exports.VALID_ENGINES = { node: [16, 18, 20] };

package/lib/frameworks/next/index.js

@@ -114,6 +114,10 @@ async function build(dir) {
         headers.push(...headersFromMetaFiles);
         if (appPathsManifest) {
             const unrenderedServerComponents = (0, utils_2.getNonStaticServerComponents)(appPathsManifest, appPathRoutesManifest, prerenderedRoutes, dynamicRoutes);
+            if (unrenderedServerComponents.has("/_not-found") &&
+                (await (0, utils_2.hasStaticAppNotFoundComponent)(dir, distDir))) {
+                unrenderedServerComponents.delete("/_not-found");
+            }
             for (const key of unrenderedServerComponents) {
                 reasonsForBackend.add(`non-static component ${key}`);
             }

package/lib/frameworks/next/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
+exports.hasStaticAppNotFoundComponent = exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -156,7 +156,7 @@ function getNonStaticServerComponents(appPathsManifest, appPathRoutesManifest, p
         return !(prerenderedRoutes.includes(path) || dynamicRoutes.includes(path));
     })
         .map(([it]) => it);
-    return nonStaticServerComponents;
+    return new Set(nonStaticServerComponents);
 }
 exports.getNonStaticServerComponents = getNonStaticServerComponents;
 async function getHeadersFromMetaFiles(sourceDir, distDir, basePath, appPathRoutesManifest) {
@@ -195,3 +195,7 @@ function getNextVersion(cwd) {
     return nextVersionSemver.toString();
 }
 exports.getNextVersion = getNextVersion;
+async function hasStaticAppNotFoundComponent(sourceDir, distDir) {
+    return (0, fs_extra_1.pathExists)((0, path_1.join)(sourceDir, distDir, "server", "app", "_not-found.html"));
+}
+exports.hasStaticAppNotFoundComponent = hasStaticAppNotFoundComponent;

package/lib/functionsShellCommandAction.js

@@ -4,7 +4,6 @@ exports.actionFunction = void 0;
 const clc = require("colorette");
 const repl = require("repl");
 const _ = require("lodash");
-const request = require("request");
 const util = require("util");
 const shell = require("./emulator/functionsEmulatorShell");
 const commandUtils = require("./emulator/commandUtils");
@@ -16,6 +15,7 @@ const types_1 = require("./emulator/types");
 const hubClient_1 = require("./emulator/hubClient");
 const portUtils_1 = require("./emulator/portUtils");
 const constants_1 = require("./emulator/constants");
+const localFunction_2 = require("./localFunction");
 const projectUtils_1 = require("./projectUtils");
 const serveFunctions = new functions_1.FunctionsServer();
 const actionFunction = async (options) => {
@@ -89,8 +89,8 @@ const actionFunction = async (options) => {
         }
         utils.logLabeledWarning("functions", `The following emulators are not running, calls to these services will affect production: ${clc.bold(otherEmulators.join(", "))}`);
         const writer = (output) => {
-            if (output instanceof request.Request) {
-                return "Sent request to function.";
+            if (output === localFunction_2.HTTPS_SENTINEL) {
+                return localFunction_2.HTTPS_SENTINEL;
             }
             return util.inspect(output);
         };

package/lib/gcp/cloudbuild.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteRepository = exports.getRepository = exports.createRepository = exports.fetchLinkableRepositories = exports.deleteConnection = exports.getConnection = exports.createConnection = void 0;
+exports.deleteRepository = exports.getRepository = exports.createRepository = exports.fetchLinkableRepositories = exports.deleteConnection = exports.listConnections = exports.getConnection = exports.createConnection = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
+const PAGE_SIZE_MAX = 100;
 const client = new apiv2_1.Client({
     urlPrefix: api_1.cloudbuildOrigin,
     auth: true,
     apiVersion: "v2",
 });
-async function createConnection(projectId, location, connectionId) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/connections`, { githubConfig: {} }, { queryParams: { connectionId } });
+async function createConnection(projectId, location, connectionId, githubConfig = {}) {
+    const res = await client.post(`projects/${projectId}/locations/${location}/connections`, { githubConfig }, { queryParams: { connectionId } });
     return res.body;
 }
 exports.createConnection = createConnection;
@@ -19,6 +20,26 @@ async function getConnection(projectId, location, connectionId) {
     return res.body;
 }
 exports.getConnection = getConnection;
+async function listConnections(projectId, location) {
+    const conns = [];
+    const getNextPage = async (pageToken = "") => {
+        const res = await client.get(`/projects/${projectId}/locations/${location}/connections`, {
+            queryParams: {
+                pageSize: PAGE_SIZE_MAX,
+                pageToken,
+            },
+        });
+        if (Array.isArray(res.body.connections)) {
+            conns.push(...res.body.connections);
+        }
+        if (res.body.nextPageToken) {
+            await getNextPage(res.body.nextPageToken);
+        }
+    };
+    await getNextPage();
+    return conns;
+}
+exports.listConnections = listConnections;
 async function deleteConnection(projectId, location, connectionId) {
     const name = `projects/${projectId}/locations/${location}/connections/${connectionId}`;
     const res = await client.delete(name);

package/lib/gcp/storage.js

@@ -2,23 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceAccount = exports.listBuckets = exports.getBucket = exports.deleteObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
 const path = require("path");
+const clc = require("colorette");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const projects_1 = require("../management/projects");
+const ensureApiEnabled_1 = require("../ensureApiEnabled");
 async function getDefaultBucket(projectId) {
     var _a;
+    await (0, ensureApiEnabled_1.ensure)(projectId, "firebasestorage.googleapis.com", "storage", false);
     try {
-        const metadata = await (0, projects_1.getFirebaseProject)(projectId);
-        if (!((_a = metadata.resources) === null || _a === void 0 ? void 0 : _a.storageBucket)) {
+        const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.firebaseStorageOrigin, apiVersion: "v1alpha" });
+        const response = await localAPIClient.get(`/projects/${projectId}/defaultBucket`);
+        if (!((_a = response.body) === null || _a === void 0 ? void 0 : _a.bucket.name)) {
             logger_1.logger.debug("Default storage bucket is undefined.");
             throw new error_1.FirebaseError("Your project is being set up. Please wait a minute before deploying again.");
         }
-        return metadata.resources.storageBucket;
+        return response.body.bucket.name.split("/").pop();
     }
     catch (err) {
-        logger_1.logger.info("\n\nThere was an issue deploying your functions. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
+        if ((err === null || err === void 0 ? void 0 : err.status) === 404) {
+            throw new error_1.FirebaseError(`Firebase Storage has not been set up on project '${clc.bold(projectId)}'. Go to https://console.firebase.google.com/project/${projectId}/storage and click 'Get Started' to set up Firebase Storage.`);
+        }
+        logger_1.logger.info("\n\nUnexpected error when fetching default storage bucket.");
         throw err;
     }
 }

package/lib/hosting/runTags.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureLatestRevisionTagged = exports.setRewriteTags = exports.setGarbageCollectionThreshold = exports.gcTagsForServices = exports.TODO_TAG_NAME = void 0;
+const node_path_1 = require("node:path");
 const run = require("../gcp/run");
 const api = require("./api");
 const error_1 = require("../error");
@@ -10,7 +11,7 @@ async function gcTagsForServices(project, services) {
     var _a;
     const validTagsByServiceByRegion = {};
     const sites = await api.listSites(project);
-    const allVersionsNested = await Promise.all(sites.map((site) => api.listVersions(site.name)));
+    const allVersionsNested = await Promise.all(sites.map((site) => api.listVersions(node_path_1.posix.basename(site.name))));
     const activeVersions = [...(0, functional_1.flattenArray)(allVersionsNested)].filter((version) => {
         return version.status === "CREATED" || version.status === "FINALIZED";
     });