firebase-tools 11.29.0 → 11.30.0

package/lib/frameworks/next/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.init = exports.build = exports.discover = exports.type = exports.support = exports.name = void 0;
+exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.init = exports.build = exports.discover = exports.docsUrl = exports.type = exports.support = exports.name = void 0;
 const child_process_1 = require("child_process");
 const cross_spawn_1 = require("cross-spawn");
 const promises_1 = require("fs/promises");
@@ -14,27 +14,27 @@ const stream_chain_1 = require("stream-chain");
 const stream_json_1 = require("stream-json");
 const Pick_1 = require("stream-json/filters/Pick");
 const StreamObject_1 = require("stream-json/streamers/StreamObject");
-const __1 = require("..");
+const fsutils_1 = require("../../fsutils");
 const prompt_1 = require("../../prompt");
 const error_1 = require("../../error");
-const utils_1 = require("./utils");
-const utils_2 = require("../utils");
-const utils_3 = require("../utils");
-const utils_4 = require("./utils");
-const constants_1 = require("./constants");
+const constants_1 = require("../constants");
+const utils_1 = require("../utils");
+const utils_2 = require("./utils");
+const constants_2 = require("./constants");
 const DEFAULT_BUILD_SCRIPT = ["next build"];
 const PUBLIC_DIR = "public";
 exports.name = "Next.js";
-exports.support = "experimental";
+exports.support = "preview";
 exports.type = 2;
+exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/nextjs";
 const DEFAULT_NUMBER_OF_REASONS_TO_LIST = 5;
 function getNextVersion(cwd) {
     var _a;
-    return (_a = (0, __1.findDependency)("next", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
+    return (_a = (0, utils_1.findDependency)("next", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
 }
 function getReactVersion(cwd) {
     var _a;
-    return (_a = (0, __1.findDependency)("react-dom", { cwd, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
+    return (_a = (0, utils_1.findDependency)("react-dom", { cwd, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
 }
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
@@ -46,8 +46,8 @@ async function discover(dir) {
 exports.discover = discover;
 async function build(dir) {
     var _a, _b;
-    const { default: nextBuild } = (0, __1.relativeRequire)(dir, "next/dist/build");
-    await (0, utils_3.warnIfCustomBuildScript)(dir, exports.name, DEFAULT_BUILD_SCRIPT);
+    const { default: nextBuild } = (0, utils_1.relativeRequire)(dir, "next/dist/build");
+    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";
@@ -56,88 +56,97 @@ async function build(dir) {
         console.error(e.message);
         throw e;
     });
-    const reasonsForBackend = [];
+    const reasonsForBackend = new Set();
     const { distDir, trailingSlash } = await getConfig(dir);
-    if (await (0, utils_1.isUsingMiddleware)((0, path_1.join)(dir, distDir), false)) {
-        reasonsForBackend.push("middleware");
+    if (await (0, utils_2.isUsingMiddleware)((0, path_1.join)(dir, distDir), false)) {
+        reasonsForBackend.add("middleware");
     }
-    if (await (0, utils_1.isUsingImageOptimization)((0, path_1.join)(dir, distDir))) {
-        reasonsForBackend.push(`Image Optimization`);
+    if (await (0, utils_2.isUsingImageOptimization)((0, path_1.join)(dir, distDir))) {
+        reasonsForBackend.add(`Image Optimization`);
     }
-    if ((0, utils_1.isUsingAppDirectory)((0, path_1.join)(dir, distDir))) {
-        reasonsForBackend.push("app directory (unstable)");
-    }
-    const prerenderManifest = await (0, utils_2.readJSON)((0, path_1.join)(dir, distDir, constants_1.PRERENDER_MANIFEST));
+    const prerenderManifest = await (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, constants_2.PRERENDER_MANIFEST));
     const dynamicRoutesWithFallback = Object.entries(prerenderManifest.dynamicRoutes || {}).filter(([, it]) => it.fallback !== false);
     if (dynamicRoutesWithFallback.length > 0) {
         for (const [key] of dynamicRoutesWithFallback) {
-            reasonsForBackend.push(`use of fallback ${key}`);
+            reasonsForBackend.add(`use of fallback ${key}`);
         }
     }
     const routesWithRevalidate = Object.entries(prerenderManifest.routes).filter(([, it]) => it.initialRevalidateSeconds);
     if (routesWithRevalidate.length > 0) {
-        for (const [key] of routesWithRevalidate) {
-            reasonsForBackend.push(`use of revalidate ${key}`);
+        for (const [, { srcRoute }] of routesWithRevalidate) {
+            reasonsForBackend.add(`use of revalidate ${srcRoute}`);
         }
     }
-    const pagesManifestJSON = await (0, utils_2.readJSON)((0, path_1.join)(dir, distDir, "server", constants_1.PAGES_MANIFEST));
+    const pagesManifestJSON = await (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, "server", constants_2.PAGES_MANIFEST));
     const prerenderedRoutes = Object.keys(prerenderManifest.routes);
     const dynamicRoutes = Object.keys(prerenderManifest.dynamicRoutes);
-    const unrenderedPages = Object.keys(pagesManifestJSON).filter((it) => !(["/_app", "/", "/_error", "/_document", "/404"].includes(it) ||
-        prerenderedRoutes.includes(it) ||
-        dynamicRoutes.includes(it)));
-    if (unrenderedPages.length > 0) {
-        for (const key of unrenderedPages) {
-            reasonsForBackend.push(`non-static route ${key}`);
-        }
+    const unrenderedPages = (0, utils_2.getNonStaticRoutes)(pagesManifestJSON, prerenderedRoutes, dynamicRoutes);
+    for (const key of unrenderedPages) {
+        reasonsForBackend.add(`non-static route ${key}`);
     }
-    const manifest = await (0, utils_2.readJSON)((0, path_1.join)(dir, distDir, constants_1.ROUTES_MANIFEST));
+    const manifest = await (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, constants_2.ROUTES_MANIFEST));
     const { headers: nextJsHeaders = [], redirects: nextJsRedirects = [], rewrites: nextJsRewrites = [], } = manifest;
-    const isEveryHeaderSupported = nextJsHeaders.every(utils_1.isHeaderSupportedByHosting);
+    const isEveryHeaderSupported = nextJsHeaders.every(utils_2.isHeaderSupportedByHosting);
     if (!isEveryHeaderSupported) {
-        reasonsForBackend.push("advanced headers");
+        reasonsForBackend.add("advanced headers");
     }
-    const headers = nextJsHeaders.filter(utils_1.isHeaderSupportedByHosting).map(({ source, headers }) => ({
-        source: (0, utils_1.cleanEscapedChars)(source),
+    const headers = nextJsHeaders
+        .filter(utils_2.isHeaderSupportedByHosting)
+        .map(({ source, headers }) => ({
+        source: (0, utils_2.cleanEscapedChars)(source),
         headers,
     }));
+    const [appPathsManifest, appPathRoutesManifest] = await Promise.all([
+        (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, "server", constants_2.APP_PATHS_MANIFEST)).catch(() => undefined),
+        (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, constants_2.APP_PATH_ROUTES_MANIFEST)).catch(() => undefined),
+    ]);
+    if (appPathRoutesManifest) {
+        const headersFromMetaFiles = await (0, utils_2.getHeadersFromMetaFiles)(dir, distDir, appPathRoutesManifest);
+        headers.push(...headersFromMetaFiles);
+        if (appPathsManifest) {
+            const unrenderedServerComponents = (0, utils_2.getNonStaticServerComponents)(appPathsManifest, appPathRoutesManifest, prerenderedRoutes, dynamicRoutes);
+            for (const key of unrenderedServerComponents) {
+                reasonsForBackend.add(`non-static component ${key}`);
+            }
+        }
+    }
     const isEveryRedirectSupported = nextJsRedirects
         .filter((it) => !it.internal)
-        .every(utils_1.isRedirectSupportedByHosting);
+        .every(utils_2.isRedirectSupportedByHosting);
     if (!isEveryRedirectSupported) {
-        reasonsForBackend.push("advanced redirects");
+        reasonsForBackend.add("advanced redirects");
     }
     const redirects = nextJsRedirects
-        .filter(utils_1.isRedirectSupportedByHosting)
+        .filter(utils_2.isRedirectSupportedByHosting)
         .map(({ source, destination, statusCode: type }) => ({
-        source: (0, utils_1.cleanEscapedChars)(source),
+        source: (0, utils_2.cleanEscapedChars)(source),
         destination,
         type,
     }));
-    const nextJsRewritesToUse = (0, utils_1.getNextjsRewritesToUse)(nextJsRewrites);
+    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))) {
-        reasonsForBackend.push("advanced rewrites");
+        reasonsForBackend.add("advanced rewrites");
     }
-    const isEveryRewriteSupported = nextJsRewritesToUse.every(utils_1.isRewriteSupportedByHosting);
+    const isEveryRewriteSupported = nextJsRewritesToUse.every(utils_2.isRewriteSupportedByHosting);
     if (!isEveryRewriteSupported) {
-        reasonsForBackend.push("advanced rewrites");
+        reasonsForBackend.add("advanced rewrites");
     }
     const rewrites = nextJsRewritesToUse
-        .filter(utils_1.isRewriteSupportedByHosting)
+        .filter(utils_2.isRewriteSupportedByHosting)
         .map(({ source, destination }) => ({
-        source: (0, utils_1.cleanEscapedChars)(source),
+        source: (0, utils_2.cleanEscapedChars)(source),
         destination,
     }));
-    const wantsBackend = reasonsForBackend.length > 0;
+    const wantsBackend = reasonsForBackend.size > 0;
     if (wantsBackend) {
         const numberOfReasonsToList = process.env.DEBUG ? Infinity : DEFAULT_NUMBER_OF_REASONS_TO_LIST;
         console.log("Building a Cloud Function to run this application. This is needed due to:");
-        for (const reason of reasonsForBackend.slice(0, numberOfReasonsToList)) {
+        for (const reason of Array.from(reasonsForBackend).slice(0, numberOfReasonsToList)) {
             console.log(` • ${reason}`);
         }
-        if (reasonsForBackend.length > numberOfReasonsToList) {
-            console.log(` • and ${reasonsForBackend.length - numberOfReasonsToList} other reasons, use --debug to see more`);
+        if (reasonsForBackend.size > numberOfReasonsToList) {
+            console.log(` • and ${reasonsForBackend.size - numberOfReasonsToList} other reasons, use --debug to see more`);
         }
         console.log("");
     }
@@ -173,24 +182,24 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir) {
             await (0, promises_1.copyFile)(appPath, (0, path_1.join)(destDir, file));
         }
     }
-    const [middlewareManifest, prerenderManifest, routesManifest] = await Promise.all([
-        (0, utils_2.readJSON)((0, path_1.join)(sourceDir, distDir, "server", constants_1.MIDDLEWARE_MANIFEST)),
-        (0, utils_2.readJSON)((0, path_1.join)(sourceDir, distDir, constants_1.PRERENDER_MANIFEST)),
-        (0, utils_2.readJSON)((0, path_1.join)(sourceDir, distDir, constants_1.ROUTES_MANIFEST)),
+    const [middlewareManifest, prerenderManifest, routesManifest, pagesManifest, appPathRoutesManifest,] = await Promise.all([
+        (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, "server", constants_2.MIDDLEWARE_MANIFEST)),
+        (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, constants_2.PRERENDER_MANIFEST)),
+        (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, constants_2.ROUTES_MANIFEST)),
+        (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, "server", constants_2.PAGES_MANIFEST)),
+        (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, constants_2.APP_PATH_ROUTES_MANIFEST)).catch(() => ({})),
     ]);
-    const middlewareMatcherRegexes = Object.values(middlewareManifest.middleware)
-        .map((it) => it.matchers)
-        .flat()
-        .map((it) => new RegExp(it.regexp));
+    const appPathRoutesEntries = Object.entries(appPathRoutesManifest);
+    const middlewareMatcherRegexes = (0, utils_2.getMiddlewareMatcherRegexes)(middlewareManifest);
     const { redirects = [], rewrites = [], headers = [] } = routesManifest;
-    const rewritesRegexesNotSupportedByHosting = (0, utils_1.getNextjsRewritesToUse)(rewrites)
-        .filter((rewrite) => !(0, utils_1.isRewriteSupportedByHosting)(rewrite))
+    const rewritesRegexesNotSupportedByHosting = (0, utils_2.getNextjsRewritesToUse)(rewrites)
+        .filter((rewrite) => !(0, utils_2.isRewriteSupportedByHosting)(rewrite))
         .map((rewrite) => new RegExp(rewrite.regex));
     const redirectsRegexesNotSupportedByHosting = redirects
-        .filter((redirect) => !(0, utils_1.isRedirectSupportedByHosting)(redirect))
+        .filter((redirect) => !(0, utils_2.isRedirectSupportedByHosting)(redirect))
         .map((redirect) => new RegExp(redirect.regex));
     const headersRegexesNotSupportedByHosting = headers
-        .filter((header) => !(0, utils_1.isHeaderSupportedByHosting)(header))
+        .filter((header) => !(0, utils_2.isHeaderSupportedByHosting)(header))
         .map((header) => new RegExp(header.regex));
     const pathsUsingsFeaturesNotSupportedByHosting = [
         ...middlewareMatcherRegexes,
@@ -198,41 +207,66 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir) {
         ...redirectsRegexesNotSupportedByHosting,
         ...headersRegexesNotSupportedByHosting,
     ];
-    for (const [path, route] of Object.entries(prerenderManifest.routes)) {
+    const pagesManifestLikePrerender = Object.fromEntries(Object.entries(pagesManifest)
+        .filter(([, srcRoute]) => srcRoute.endsWith(".html"))
+        .map(([path]) => {
+        return [path, { srcRoute: null, initialRevalidateSeconds: false, dataRoute: "" }];
+    }));
+    const routesToCopy = Object.assign(Object.assign({}, prerenderManifest.routes), pagesManifestLikePrerender);
+    await Promise.all(Object.entries(routesToCopy).map(async ([path, route]) => {
+        var _a;
         if (route.initialRevalidateSeconds ||
             pathsUsingsFeaturesNotSupportedByHosting.some((it) => path.match(it))) {
-            continue;
+            return;
         }
-        const isReactServerComponent = route.dataRoute.endsWith(".rsc");
-        const contentDist = (0, path_1.join)(sourceDir, distDir, "server", isReactServerComponent ? "app" : "pages");
+        const appPathRoute = route.srcRoute && ((_a = appPathRoutesEntries.find(([, it]) => it === route.srcRoute)) === null || _a === void 0 ? void 0 : _a[0]);
+        const contentDist = (0, path_1.join)(sourceDir, distDir, "server", appPathRoute ? "app" : "pages");
         const parts = path.split("/").filter((it) => !!it);
         const partsOrIndex = parts.length > 0 ? parts : ["index"];
-        const htmlPath = `${(0, path_1.join)(...partsOrIndex)}.html`;
-        await (0, promises_1.mkdir)((0, path_1.join)(destDir, (0, path_1.dirname)(htmlPath)), { recursive: true });
-        await (0, promises_1.copyFile)((0, path_1.join)(contentDist, htmlPath), (0, path_1.join)(destDir, htmlPath));
-        if (!isReactServerComponent) {
-            const dataPath = `${(0, path_1.join)(...partsOrIndex)}.json`;
-            await (0, promises_1.mkdir)((0, path_1.join)(destDir, (0, path_1.dirname)(route.dataRoute)), { recursive: true });
-            await (0, promises_1.copyFile)((0, path_1.join)(contentDist, dataPath), (0, path_1.join)(destDir, route.dataRoute));
+        let sourcePath = (0, path_1.join)(contentDist, ...partsOrIndex);
+        let destPath = (0, path_1.join)(destDir, ...partsOrIndex);
+        if (!(0, fsutils_1.fileExistsSync)(sourcePath) && (0, fsutils_1.fileExistsSync)(`${sourcePath}.html`)) {
+            sourcePath += ".html";
+            destPath += ".html";
         }
-    }
+        else if (appPathRoute && (0, path_1.basename)(appPathRoute) === "route" && (0, fsutils_1.dirExistsSync)(sourcePath)) {
+            sourcePath += ".body";
+        }
+        if (!(0, fs_extra_1.pathExistsSync)(sourcePath)) {
+            console.error(`Cannot find ${path} in your compiled Next.js application.`);
+            return;
+        }
+        await (0, promises_1.mkdir)((0, path_1.dirname)(destPath), { recursive: true });
+        await (0, promises_1.copyFile)(sourcePath, destPath);
+        if (route.dataRoute && !appPathRoute) {
+            const dataSourcePath = `${(0, path_1.join)(...partsOrIndex)}.json`;
+            const dataDestPath = (0, path_1.join)(destDir, route.dataRoute);
+            await (0, promises_1.mkdir)((0, path_1.dirname)(dataDestPath), { recursive: true });
+            await (0, promises_1.copyFile)((0, path_1.join)(contentDist, dataSourcePath), dataDestPath);
+        }
+    }));
 }
 exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+const BUNDLE_NEXT_CONFIG_TIMEOUT = 10000;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     const { distDir } = await getConfig(sourceDir);
-    const packageJson = await (0, utils_2.readJSON)((0, path_1.join)(sourceDir, "package.json"));
+    const packageJson = await (0, utils_1.readJSON)((0, path_1.join)(sourceDir, "package.json"));
     if ((0, fs_1.existsSync)((0, path_1.join)(sourceDir, "next.config.js"))) {
         try {
             const productionDeps = await new Promise((resolve) => {
                 const dependencies = [];
+                const npmLs = (0, cross_spawn_1.spawn)("npm", ["ls", "--omit=dev", "--all", "--json=true"], {
+                    cwd: sourceDir,
+                    timeout: constants_1.NPM_COMMAND_TIMEOUT_MILLIES,
+                });
                 const pipeline = (0, stream_chain_1.chain)([
-                    (0, cross_spawn_1.spawn)("npm", ["ls", "--omit=dev", "--all", "--json"], { cwd: sourceDir }).stdout,
+                    npmLs.stdout,
                     (0, stream_json_1.parser)({ packValues: false, packKeys: true, streamValues: false }),
                     (0, Pick_1.pick)({ filter: "dependencies" }),
                     (0, StreamObject_1.streamObject)(),
                     ({ key, value }) => [
                         key,
-                        ...(0, utils_1.allDependencyNames)(value),
+                        ...(0, utils_2.allDependencyNames)(value),
                     ],
                 ]);
                 pipeline.on("data", (it) => dependencies.push(it));
@@ -242,9 +276,10 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
             });
             const esbuildArgs = productionDeps
                 .map((it) => `--external:${it}`)
-                .concat("--bundle", "--platform=node", `--target=node${__1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
+                .concat("--bundle", "--platform=node", `--target=node${constants_1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
             const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", "esbuild", "next.config.js", ...esbuildArgs], {
                 cwd: sourceDir,
+                timeout: BUNDLE_NEXT_CONFIG_TIMEOUT,
             });
             if (bundle.status) {
                 throw new error_1.FirebaseError(bundle.stderr.toString());
@@ -252,7 +287,7 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
         }
         catch (e) {
             console.warn("Unable to bundle next.config.js for use in Cloud Functions, proceeding with deploy but problems may be enountered.");
-            console.error(e.message);
+            console.error(e.message || e);
             (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, "next.config.js"), (0, path_1.join)(destDir, "next.config.js"));
         }
     }
@@ -260,8 +295,8 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
         await (0, promises_1.mkdir)((0, path_1.join)(destDir, "public"));
         await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, "public"), (0, path_1.join)(destDir, "public"));
     }
-    if (!(await (0, utils_4.hasUnoptimizedImage)(sourceDir, distDir)) &&
-        ((0, utils_4.usesAppDirRouter)(sourceDir) || (await (0, utils_4.usesNextImage)(sourceDir, distDir)))) {
+    if (!(await (0, utils_2.hasUnoptimizedImage)(sourceDir, distDir)) &&
+        ((0, utils_2.usesAppDirRouter)(sourceDir) || (await (0, utils_2.usesNextImage)(sourceDir, distDir)))) {
         packageJson.dependencies["sharp"] = "latest";
     }
     await (0, fs_extra_1.mkdirp)((0, path_1.join)(destDir, distDir));
@@ -271,11 +306,13 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 async function getDevModeHandle(dir, hostingEmulatorInfo) {
     if (!hostingEmulatorInfo) {
-        if (await (0, utils_1.isUsingMiddleware)(dir, true)) {
+        if (await (0, utils_2.isUsingMiddleware)(dir, true)) {
             throw new error_1.FirebaseError(`${clc.bold("firebase serve")} does not support Next.js Middleware. Please use ${clc.bold("firebase emulators:start")} instead.`);
         }
     }
-    const { default: next } = (0, __1.relativeRequire)(dir, "next");
+    let next = (0, utils_1.relativeRequire)(dir, "next");
+    if ("default" in next)
+        next = next.default;
     const nextApp = next({
         dev: true,
         dir,
@@ -284,7 +321,7 @@ async function getDevModeHandle(dir, hostingEmulatorInfo) {
     });
     const handler = nextApp.getRequestHandler();
     await nextApp.prepare();
-    return (0, utils_2.simpleProxy)(async (req, res) => {
+    return (0, utils_1.simpleProxy)(async (req, res) => {
         const parsedUrl = (0, url_1.parse)(req.url, true);
         await handler(req, res, parsedUrl);
     });
@@ -298,8 +335,8 @@ async function getConfig(dir) {
         if (!version)
             throw new Error("Unable to find the next dep, try NPM installing?");
         if ((0, semver_1.gte)(version, "12.0.0")) {
-            const { default: loadConfig } = (0, __1.relativeRequire)(dir, "next/dist/server/config");
-            const { PHASE_PRODUCTION_BUILD } = (0, __1.relativeRequire)(dir, "next/constants");
+            const { default: loadConfig } = (0, utils_1.relativeRequire)(dir, "next/dist/server/config");
+            const { PHASE_PRODUCTION_BUILD } = (0, utils_1.relativeRequire)(dir, "next/constants");
             config = await loadConfig(PHASE_PRODUCTION_BUILD, dir, null);
         }
         else {

package/lib/frameworks/next/utils.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanEscapedChars = exports.pathHasRegex = void 0;
+exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanEscapedChars = exports.pathHasRegex = void 0;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const utils_1 = require("../utils");
 const constants_1 = require("./constants");
 const fsutils_1 = require("../../fsutils");
+const promises_1 = require("fs/promises");
 function pathHasRegex(path) {
     return /(?<!\\)\(/.test(path);
 }
@@ -67,13 +68,15 @@ async function isUsingMiddleware(dir, isDevMode) {
 }
 exports.isUsingMiddleware = isUsingMiddleware;
 async function isUsingImageOptimization(dir) {
-    const { isNextImageImported } = await (0, utils_1.readJSON)((0, path_1.join)(dir, constants_1.EXPORT_MARKER));
+    let { isNextImageImported } = await (0, utils_1.readJSON)((0, path_1.join)(dir, constants_1.EXPORT_MARKER));
+    if (!isNextImageImported && isUsingAppDirectory(dir)) {
+        isNextImageImported = (await (0, promises_1.readFile)((0, path_1.join)(dir, "server", "client-reference-manifest.js")))
+            .toString()
+            .includes("node_modules/next/dist/client/image.js");
+    }
     if (isNextImageImported) {
         const imagesManifest = await (0, utils_1.readJSON)((0, path_1.join)(dir, constants_1.IMAGES_MANIFEST));
-        const usingImageOptimization = imagesManifest.images.unoptimized === false;
-        if (usingImageOptimization) {
-            return true;
-        }
+        return !imagesManifest.images.unoptimized;
     }
     return false;
 }
@@ -90,3 +93,65 @@ function allDependencyNames(mod) {
     return dependencyNames;
 }
 exports.allDependencyNames = allDependencyNames;
+function getMiddlewareMatcherRegexes(middlewareManifest) {
+    const middlewareObjectValues = Object.values(middlewareManifest.middleware);
+    let middlewareMatchers;
+    if (middlewareManifest.version === 1) {
+        middlewareMatchers = middlewareObjectValues.map((page) => ({ regexp: page.regexp }));
+    }
+    else {
+        middlewareMatchers = middlewareObjectValues
+            .map((page) => page.matchers)
+            .flat();
+    }
+    return middlewareMatchers.map((matcher) => new RegExp(matcher.regexp));
+}
+exports.getMiddlewareMatcherRegexes = getMiddlewareMatcherRegexes;
+function getNonStaticRoutes(pagesManifestJSON, prerenderedRoutes, dynamicRoutes) {
+    const nonStaticRoutes = Object.entries(pagesManifestJSON)
+        .filter(([it, src]) => !((0, path_1.extname)(src) !== ".js" ||
+        ["/_app", "/_error", "/_document"].includes(it) ||
+        prerenderedRoutes.includes(it) ||
+        dynamicRoutes.includes(it)))
+        .map(([it]) => it);
+    return nonStaticRoutes;
+}
+exports.getNonStaticRoutes = getNonStaticRoutes;
+function getNonStaticServerComponents(appPathsManifest, appPathRoutesManifest, prerenderedRoutes, dynamicRoutes) {
+    const nonStaticServerComponents = Object.entries(appPathsManifest)
+        .filter(([it, src]) => {
+        if ((0, path_1.extname)(src) !== ".js")
+            return;
+        const path = appPathRoutesManifest[it];
+        return !(prerenderedRoutes.includes(path) || dynamicRoutes.includes(path));
+    })
+        .map(([it]) => it);
+    return nonStaticServerComponents;
+}
+exports.getNonStaticServerComponents = getNonStaticServerComponents;
+async function getHeadersFromMetaFiles(sourceDir, distDir, appPathRoutesManifest) {
+    const headers = [];
+    await Promise.all(Object.entries(appPathRoutesManifest).map(async ([key, source]) => {
+        if ((0, path_1.basename)(key) !== "route")
+            return;
+        const parts = source.split("/").filter((it) => !!it);
+        const partsOrIndex = parts.length > 0 ? parts : ["index"];
+        const routePath = (0, path_1.join)(sourceDir, distDir, "server", "app", ...partsOrIndex);
+        const metadataPath = `${routePath}.meta`;
+        if ((0, fsutils_1.dirExistsSync)(routePath) && (0, fsutils_1.fileExistsSync)(metadataPath)) {
+            const meta = await (0, utils_1.readJSON)(metadataPath);
+            if (meta.headers)
+                headers.push({
+                    source,
+                    headers: Object.entries(meta.headers).map(([key, value]) => ({ key, value })),
+                });
+        }
+    }));
+    return headers;
+}
+exports.getHeadersFromMetaFiles = getHeadersFromMetaFiles;
+async function getBuildId(distDir) {
+    const buildId = await (0, promises_1.readFile)((0, path_1.join)(distDir, "BUILD_ID"));
+    return buildId.toString();
+}
+exports.getBuildId = getBuildId;

package/lib/frameworks/nuxt/index.js

@@ -6,7 +6,6 @@ const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const cross_spawn_1 = require("cross-spawn");
-const __1 = require("..");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
 exports.name = "Nuxt";
@@ -28,7 +27,7 @@ async function discover(dir) {
 }
 exports.discover = discover;
 async function build(root) {
-    const { buildNuxt } = await (0, __1.relativeRequire)(root, "@nuxt/kit");
+    const { buildNuxt } = await (0, utils_1.relativeRequire)(root, "@nuxt/kit");
     const nuxtApp = await getNuxt3App(root);
     await (0, utils_1.warnIfCustomBuildScript)(root, exports.name, DEFAULT_BUILD_SCRIPT);
     await buildNuxt(nuxtApp);
@@ -36,7 +35,7 @@ async function build(root) {
 }
 exports.build = build;
 async function getNuxt3App(cwd) {
-    const { loadNuxt } = await (0, __1.relativeRequire)(cwd, "@nuxt/kit");
+    const { loadNuxt } = await (0, utils_1.relativeRequire)(cwd, "@nuxt/kit");
     return await loadNuxt({
         cwd,
         overrides: {
@@ -60,7 +59,7 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 async function getDevModeHandle(cwd) {
     const host = new Promise((resolve) => {
-        const cli = (0, __1.getNodeModuleBin)("nuxt", cwd);
+        const cli = (0, utils_1.getNodeModuleBin)("nuxt", cwd);
         const serve = (0, cross_spawn_1.spawn)(cli, ["dev"], { cwd: cwd });
         serve.stdout.on("data", (data) => {
             process.stdout.write(data);
@@ -76,7 +75,7 @@ async function getDevModeHandle(cwd) {
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(dir) {
-    const { loadNuxtConfig } = await (0, __1.relativeRequire)(dir, "@nuxt/kit");
+    const { loadNuxtConfig } = await (0, utils_1.relativeRequire)(dir, "@nuxt/kit");
     return await loadNuxtConfig(dir);
 }
 exports.getConfig = getConfig;

package/lib/frameworks/nuxt/utils.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nuxtConfigFilesExist = exports.getNuxtVersion = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const __1 = require("..");
+const utils_1 = require("../utils");
 function getNuxtVersion(cwd) {
     var _a;
-    return (_a = (0, __1.findDependency)("nuxt", {
+    return (_a = (0, utils_1.findDependency)("nuxt", {
         cwd,
         depth: 0,
         omitDev: false,

package/lib/frameworks/nuxt2/index.js

@@ -5,16 +5,16 @@ const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const semver_1 = require("semver");
-const __1 = require("..");
-const utils_1 = require("../nuxt/utils");
+const utils_1 = require("../utils");
+const utils_2 = require("../nuxt/utils");
 exports.name = "Nuxt";
 exports.support = "experimental";
 exports.type = 2;
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
-    const nuxtVersion = (0, utils_1.getNuxtVersion)(dir);
-    const anyConfigFileExists = await (0, utils_1.nuxtConfigFilesExist)(dir);
+    const nuxtVersion = (0, utils_2.getNuxtVersion)(dir);
+    const anyConfigFileExists = await (0, utils_2.nuxtConfigFilesExist)(dir);
     if (!anyConfigFileExists && !nuxtVersion)
         return;
     if (nuxtVersion && (0, semver_1.lt)(nuxtVersion, "3.0.0-0"))
@@ -22,7 +22,7 @@ async function discover(dir) {
 }
 exports.discover = discover;
 async function getNuxtApp(cwd) {
-    return await (0, __1.relativeRequire)(cwd, "nuxt/dist/nuxt.js");
+    return await (0, utils_1.relativeRequire)(cwd, "nuxt/dist/nuxt.js");
 }
 async function build(root) {
     const nuxt = await getNuxtApp(root);