firebase-tools 11.15.0 → 11.16.0

package/lib/frameworks/index.js

@@ -139,12 +139,14 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
     }
     const configs = (0, config_1.hostingConfig)(options);
     let firebaseDefaults = undefined;
-    if (configs.length === 0)
+    if (configs.length === 0) {
         return;
+    }
     for (const config of configs) {
         const { source, site, public: publicDir } = config;
-        if (!source)
+        if (!source) {
             continue;
+        }
         config.rewrites || (config.rewrites = []);
         config.redirects || (config.redirects = []);
         config.headers || (config.headers = []);
@@ -152,8 +154,9 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
         const dist = (0, path_1.join)(projectRoot, ".firebase", site);
         const hostingDist = (0, path_1.join)(dist, "hosting");
         const functionsDist = (0, path_1.join)(dist, "functions");
-        if (publicDir)
+        if (publicDir) {
             throw new Error(`hosting.public and hosting.source cannot both be set in firebase.json`);
+        }
         const getProjectPath = (...args) => (0, path_1.join)(projectRoot, source, ...args);
         const functionName = `ssr${site.toLowerCase().replace(/-/g, "")}`;
         const usesFirebaseAdminSdk = !!findDependency("firebase-admin", { cwd: getProjectPath() });
@@ -232,8 +235,9 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
         if (devModeHandle) {
             config.public = (0, path_1.relative)(projectRoot, publicDirectory);
             options.frameworksDevModeHandle = devModeHandle;
-            if (mayWantBackend && firebaseDefaults)
+            if (mayWantBackend && firebaseDefaults) {
                 codegenFunctionsDirectory = codegenDevModeFunctionsDirectory;
+            }
         }
         else {
             const { wantsBackend = false, rewrites = [], redirects = [], headers = [], } = (await build(getProjectPath())) || {};
@@ -248,6 +252,7 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
             if (wantsBackend)
                 codegenFunctionsDirectory = codegenProdModeFunctionsDirectory;
         }
+        config.webFramework = `${framework}${codegenFunctionsDirectory ? "_ssr" : ""}`;
         if (codegenFunctionsDirectory) {
             if (firebaseDefaults)
                 firebaseDefaults._authTokenSyncURL = "/__session";

package/lib/frameworks/next/index.js

@@ -12,6 +12,7 @@ const prompt_1 = require("../../prompt");
 const semver_1 = require("semver");
 const logger_1 = require("../../logger");
 const error_1 = require("../../error");
+const fsutils_1 = require("../../fsutils");
 const CLI_COMMAND = (0, path_1.join)("node_modules", ".bin", process.platform === "win32" ? "next.cmd" : "next");
 exports.name = "Next.js";
 exports.support = "experimental";
@@ -20,6 +21,10 @@ function getNextVersion(cwd) {
     var _a;
     return (_a = (0, __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;
+}
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
@@ -30,6 +35,10 @@ async function discover(dir) {
 exports.discover = discover;
 async function build(dir) {
     const { default: nextBuild } = (0, __1.relativeRequire)(dir, "next/dist/build");
+    const reactVersion = getReactVersion(dir);
+    if (reactVersion && (0, semver_1.gte)(reactVersion, "18.0.0")) {
+        process.env.__NEXT_REACT_ROOT = "true";
+    }
     await nextBuild(dir, null, false, false, true).catch((e) => {
         console.error(e.message);
         throw e;
@@ -46,12 +55,19 @@ async function build(dir) {
     const exportDetailBuffer = exportDetailExists ? await (0, promises_1.readFile)(exportDetailPath) : undefined;
     const exportDetailJson = exportDetailBuffer && JSON.parse(exportDetailBuffer.toString());
     if (exportDetailJson === null || exportDetailJson === void 0 ? void 0 : exportDetailJson.success) {
+        const appPathRoutesManifestPath = (0, path_1.join)(dir, distDir, "app-path-routes-manifest.json");
+        const appPathRoutesManifestJSON = (0, fsutils_1.fileExistsSync)(appPathRoutesManifestPath)
+            ? await (0, promises_1.readFile)(appPathRoutesManifestPath).then((it) => JSON.parse(it.toString()))
+            : {};
         const prerenderManifestJSON = await (0, promises_1.readFile)((0, path_1.join)(dir, distDir, "prerender-manifest.json")).then((it) => JSON.parse(it.toString()));
         const anyDynamicRouteFallbacks = !!Object.values(prerenderManifestJSON.dynamicRoutes || {}).find((it) => it.fallback !== false);
         const pagesManifestJSON = await (0, promises_1.readFile)((0, path_1.join)(dir, distDir, "server", "pages-manifest.json")).then((it) => JSON.parse(it.toString()));
         const prerenderedRoutes = Object.keys(prerenderManifestJSON.routes);
         const dynamicRoutes = Object.keys(prerenderManifestJSON.dynamicRoutes);
-        const unrenderedPages = Object.keys(pagesManifestJSON).filter((it) => !(["/_app", "/_error", "/_document", "/404"].includes(it) ||
+        const unrenderedPages = [
+            ...Object.keys(pagesManifestJSON),
+            ...Object.values(appPathRoutesManifestJSON),
+        ].filter((it) => !(["/_app", "/", "/_error", "/_document", "/404"].includes(it) ||
             prerenderedRoutes.includes(it) ||
             dynamicRoutes.includes(it)));
         if (!anyDynamicRouteFallbacks && unrenderedPages.length === 0) {
@@ -85,7 +101,7 @@ async function init(setup) {
         message: "What language would you like to use?",
         choices: ["JavaScript", "TypeScript"],
     });
-    (0, child_process_1.execSync)(`npx --yes create-next-app@latest -e hello-world ${setup.hosting.source} ${language === "TypeScript" ? "--ts" : ""}`, { stdio: "inherit" });
+    (0, child_process_1.execSync)(`npx --yes create-next-app@latest -e hello-world ${setup.hosting.source} --use-npm ${language === "TypeScript" ? "--ts" : ""}`, { stdio: "inherit" });
 }
 exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir) {
@@ -104,20 +120,26 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir) {
             await (0, fs_extra_1.copy)(publicPath, destDir);
         }
         await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, distDir, "static"), (0, path_1.join)(destDir, "_next", "static"));
-        const serverPagesDir = (0, path_1.join)(sourceDir, distDir, "server", "pages");
-        await (0, fs_extra_1.copy)(serverPagesDir, destDir, {
-            filter: async (filename) => {
-                const status = await (0, promises_1.stat)(filename);
-                if (status.isDirectory())
-                    return true;
-                return (0, path_1.extname)(filename) === ".html";
-            },
-        });
+        for (const file of ["index.html", "404.html", "500.html"]) {
+            const pagesPath = (0, path_1.join)(sourceDir, distDir, "server", "pages", file);
+            if (await (0, fs_extra_1.pathExists)(pagesPath)) {
+                await (0, promises_1.copyFile)(pagesPath, (0, path_1.join)(destDir, file));
+                continue;
+            }
+            const appPath = (0, path_1.join)(sourceDir, distDir, "server", "app", file);
+            if (await (0, fs_extra_1.pathExists)(appPath)) {
+                await (0, promises_1.copyFile)(appPath, (0, path_1.join)(destDir, file));
+            }
+        }
         const prerenderManifestBuffer = await (0, promises_1.readFile)((0, path_1.join)(sourceDir, distDir, "prerender-manifest.json"));
         const prerenderManifest = JSON.parse(prerenderManifestBuffer.toString());
-        for (const route in prerenderManifest.routes) {
-            if (prerenderManifest.routes[route]) {
-                const parts = route
+        for (const path in prerenderManifest.routes) {
+            if (prerenderManifest.routes[path]) {
+                const { initialRevalidateSeconds } = prerenderManifest.routes[path];
+                if (initialRevalidateSeconds) {
+                    continue;
+                }
+                const parts = path
                     .split("/")
                     .slice(1)
                     .filter((it) => !!it);
@@ -125,10 +147,28 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir) {
                 const dataPath = `${(0, path_1.join)(...partsOrIndex)}.json`;
                 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)(sourceDir, distDir, "server", "pages", htmlPath), (0, path_1.join)(destDir, htmlPath));
-                const dataRoute = prerenderManifest.routes[route].dataRoute;
+                const pagesHtmlPath = (0, path_1.join)(sourceDir, distDir, "server", "pages", htmlPath);
+                if (await (0, fs_extra_1.pathExists)(pagesHtmlPath)) {
+                    await (0, promises_1.copyFile)(pagesHtmlPath, (0, path_1.join)(destDir, htmlPath));
+                }
+                else {
+                    const appHtmlPath = (0, path_1.join)(sourceDir, distDir, "server", "app", htmlPath);
+                    if (await (0, fs_extra_1.pathExists)(appHtmlPath)) {
+                        await (0, promises_1.copyFile)(appHtmlPath, (0, path_1.join)(destDir, htmlPath));
+                    }
+                }
+                const dataRoute = prerenderManifest.routes[path].dataRoute;
                 await (0, promises_1.mkdir)((0, path_1.join)(destDir, (0, path_1.dirname)(dataRoute)), { recursive: true });
-                await (0, promises_1.copyFile)((0, path_1.join)(sourceDir, distDir, "server", "pages", dataPath), (0, path_1.join)(destDir, dataRoute));
+                const pagesDataPath = (0, path_1.join)(sourceDir, distDir, "server", "pages", dataPath);
+                if (await (0, fs_extra_1.pathExists)(pagesDataPath)) {
+                    await (0, promises_1.copyFile)(pagesDataPath, (0, path_1.join)(destDir, dataRoute));
+                }
+                else {
+                    const appDataPath = (0, path_1.join)(sourceDir, distDir, "server", "app", dataPath);
+                    if (await (0, fs_extra_1.pathExists)(appDataPath)) {
+                        await (0, promises_1.copyFile)(appDataPath, (0, path_1.join)(destDir, dataRoute));
+                    }
+                }
             }
         }
     }

package/lib/serve/hosting.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = exports.start = exports.stop = void 0;
 const morgan = require("morgan");
-const superstatic_1 = require("superstatic");
+const { server: superstatic } = require("superstatic");
 const clc = require("colorette");
 const net_1 = require("net");
 const detectProjectRoot_1 = require("../detectProjectRoot");
@@ -36,13 +36,13 @@ function startServer(options, config, port, init) {
     const after = options.frameworksDevModeHandle && {
         files: options.frameworksDevModeHandle,
     };
-    const server = (0, superstatic_1.server)({
+    const server = superstatic({
         debug: false,
         port: port,
-        hostname: options.host,
+        host: options.host,
         config: config,
         compression: true,
-        cwd: (0, detectProjectRoot_1.detectProjectRoot)(options) || undefined,
+        cwd: (0, detectProjectRoot_1.detectProjectRoot)(options),
         stack: "strict",
         before: {
             files: (req, res, next) => {