firebase-tools 11.15.0 → 11.16.1

package/lib/emulator/extensionsEmulator.js

@@ -44,7 +44,7 @@ class ExtensionsEmulator {
         if (!functionsEmulator) {
             throw new error_1.FirebaseError("Extensions Emulator is running but Functions emulator is not. This should never happen.");
         }
-        return functionsEmulator.getInfo();
+        return Object.assign(Object.assign({}, functionsEmulator.getInfo()), { name: this.getName() });
     }
     getName() {
         return types_1.Emulators.EXTENSIONS;

package/lib/emulator/functionsEmulator.js

@@ -137,10 +137,11 @@ class FunctionsEmulator {
                             method: req.method,
                             path: `/functions/projects/${projectId}/triggers/${triggerId}`,
                             headers: req.headers,
-                        }, resolve);
+                        });
                         trigReq.on("error", reject);
                         trigReq.write(rawBody);
                         trigReq.end();
+                        resolve();
                     });
                 });
             });

package/lib/emulator/functionsEmulatorShared.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBackendInfo = exports.getSecretLocalPath = exports.getSignatureType = exports.formatHost = exports.findModuleRoot = exports.waitForBody = exports.getServiceFromEventType = exports.getFunctionService = exports.getTemporarySocketPath = exports.getEmulatedTriggersFromDefinitions = exports.emulatedFunctionsByRegion = exports.emulatedFunctionsFromEndpoints = exports.prepareEndpoints = exports.eventServiceImplemented = exports.EmulatedTrigger = exports.HttpConstants = void 0;
+exports.toBackendInfo = exports.getSecretLocalPath = exports.getSignatureType = exports.formatHost = exports.findModuleRoot = exports.waitForBody = exports.getServiceFromEventType = exports.getFunctionService = exports.getTemporarySocketPath = exports.getEmulatedTriggersFromDefinitions = exports.emulatedFunctionsByRegion = exports.emulatedFunctionsFromEndpoints = exports.prepareEndpoints = exports.eventServiceImplemented = exports.EmulatedTrigger = exports.HttpConstants = exports.EVENTARC_SOURCE_ENV = void 0;
 const os = require("os");
 const path = require("path");
 const fs = require("fs");
@@ -20,6 +20,7 @@ const V2_EVENTS = [
     ...events.v2.STORAGE_EVENTS,
     ...events.v2.DATABASE_EVENTS,
 ];
+exports.EVENTARC_SOURCE_ENV = "EVENTARC_CLOUD_EVENT_SOURCE";
 class HttpConstants {
 }
 exports.HttpConstants = HttpConstants;
@@ -73,6 +74,16 @@ function emulatedFunctionsFromEndpoints(endpoints) {
         };
         def.availableMemoryMb = endpoint.availableMemoryMb || 256;
         def.labels = endpoint.labels || {};
+        if (endpoint.platform === "gcfv1") {
+            def.labels[exports.EVENTARC_SOURCE_ENV] =
+                "cloudfunctions-emulated.googleapis.com" +
+                    `/projects/${endpoint.project || "project"}/locations/${endpoint.region}/functions/${endpoint.id}`;
+        }
+        else if (endpoint.platform === "gcfv2") {
+            def.labels[exports.EVENTARC_SOURCE_ENV] =
+                "run-emulated.googleapis.com" +
+                    `/projects/${endpoint.project || "project"}/locations/${endpoint.region}/services/${endpoint.id}`;
+        }
         def.timeoutSeconds = endpoint.timeoutSeconds || 60;
         def.secretEnvironmentVariables = endpoint.secretEnvironmentVariables || [];
         def.platform = endpoint.platform;

package/lib/emulator/functionsRuntimeWorker.js

@@ -9,6 +9,7 @@ const emulatorLogger_1 = require("./emulatorLogger");
 const error_1 = require("../error");
 var RuntimeWorkerState;
 (function (RuntimeWorkerState) {
+    RuntimeWorkerState["CREATED"] = "CREATED";
     RuntimeWorkerState["IDLE"] = "IDLE";
     RuntimeWorkerState["BUSY"] = "BUSY";
     RuntimeWorkerState["FINISHING"] = "FINISHING";
@@ -18,7 +19,7 @@ class RuntimeWorker {
     constructor(key, runtime) {
         this.stateEvents = new events_1.EventEmitter();
         this.logListeners = [];
-        this._state = RuntimeWorkerState.IDLE;
+        this._state = RuntimeWorkerState.CREATED;
         this.id = uuid.v4();
         this.key = key;
         this.runtime = runtime;
@@ -58,6 +59,9 @@ class RuntimeWorker {
         }
         return lines[lines.length - 1];
     }
+    readyForWork() {
+        this.state = RuntimeWorkerState.IDLE;
+    }
     sendDebugMsg(debug) {
         return new Promise((resolve, reject) => {
             this.runtime.process.send(JSON.stringify(debug), (err) => {
@@ -138,7 +142,10 @@ class RuntimeWorker {
                 method: "GET",
                 path: "/__/health",
                 socketPath: this.runtime.socketPath,
-            }, () => resolve())
+            }, () => {
+                this.readyForWork();
+                resolve();
+            })
                 .end();
             req.on("error", (error) => {
                 reject(error);

package/lib/emulator/storage/apis/firebase.js

@@ -4,9 +4,9 @@ exports.createFirebaseEndpoints = void 0;
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 const uuid = require("uuid");
-const zlib_1 = require("zlib");
 const metadata_1 = require("../metadata");
 const express_1 = require("express");
+const shared_1 = require("./shared");
 const registry_1 = require("../../registry");
 const multipart_1 = require("../multipart");
 const errors_1 = require("../errors");
@@ -17,7 +17,7 @@ function createFirebaseEndpoints(emulator) {
     const { storageLayer, uploadService } = emulator;
     if (process.env.STORAGE_EMULATOR_DEBUG) {
         firebaseStorageAPI.use((req, res, next) => {
-            console.log("--------------INCOMING REQUEST--------------");
+            console.log("--------------INCOMING FIREBASE REQUEST--------------");
             console.log(`${req.method.toUpperCase()} ${req.path}`);
             console.log("-- query:");
             console.log(JSON.stringify(req.query, undefined, 2));
@@ -98,24 +98,7 @@ function createFirebaseEndpoints(emulator) {
             metadata.addDownloadToken(true);
         }
         if (req.query.alt === "media") {
-            const isGZipped = metadata.contentEncoding === "gzip";
-            if (isGZipped) {
-                data = (0, zlib_1.gunzipSync)(data);
-            }
-            res.setHeader("Accept-Ranges", "bytes");
-            res.setHeader("Content-Type", metadata.contentType || "application/octet-stream");
-            res.setHeader("Content-Disposition", metadata.contentDisposition || "inline");
-            setObjectHeaders(res, metadata, { "Content-Encoding": isGZipped ? "identity" : undefined });
-            const byteRange = req.range(data.byteLength, { combine: true });
-            if (Array.isArray(byteRange) && byteRange.type === "bytes" && byteRange.length > 0) {
-                const range = byteRange[0];
-                res.setHeader("Content-Range", `${byteRange.type} ${range.start}-${range.end}/${data.byteLength}`);
-                res.status(206).end(data.slice(range.start, range.end + 1));
-            }
-            else {
-                res.end(data);
-            }
-            return;
+            return (0, shared_1.sendFileBytes)(metadata, data, req, res);
         }
         return res.json(new metadata_1.OutgoingFirebaseMetadata(metadata));
     });
@@ -215,7 +198,7 @@ function createFirebaseEndpoints(emulator) {
                 const upload = uploadService.startResumableUpload({
                     bucketId,
                     objectId,
-                    metadataRaw: JSON.stringify(req.body),
+                    metadata: req.body,
                     authorization: req.header("authorization"),
                 });
                 res.header("x-goog-upload-chunk-granularity", "10000");
@@ -330,7 +313,7 @@ function createFirebaseEndpoints(emulator) {
             const upload = uploadService.multipartUpload({
                 bucketId,
                 objectId,
-                metadataRaw,
+                metadata: JSON.parse(metadataRaw),
                 dataRaw: dataRaw,
                 authorization: req.header("authorization"),
             });
@@ -480,14 +463,11 @@ function createFirebaseEndpoints(emulator) {
     return firebaseStorageAPI;
 }
 exports.createFirebaseEndpoints = createFirebaseEndpoints;
-function setObjectHeaders(res, metadata, headerOverride = { "Content-Encoding": undefined }) {
+function setObjectHeaders(res, metadata) {
     if (metadata.contentDisposition) {
         res.setHeader("Content-Disposition", metadata.contentDisposition);
     }
-    if (headerOverride["Content-Encoding"]) {
-        res.setHeader("Content-Encoding", headerOverride["Content-Encoding"]);
-    }
-    else if (metadata.contentEncoding) {
+    if (metadata.contentEncoding) {
         res.setHeader("Content-Encoding", metadata.contentEncoding);
     }
     if (metadata.cacheControl) {

package/lib/emulator/storage/apis/gcloud.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCloudEndpoints = void 0;
 const express_1 = require("express");
-const zlib_1 = require("zlib");
 const types_1 = require("../../types");
 const metadata_1 = require("../metadata");
+const shared_1 = require("./shared");
 const registry_1 = require("../../registry");
 const emulatorLogger_1 = require("../../emulatorLogger");
-const crc_1 = require("../crc");
 const multipart_1 = require("../multipart");
 const upload_1 = require("../upload");
 const errors_1 = require("../errors");
@@ -17,7 +16,7 @@ function createCloudEndpoints(emulator) {
     const { adminStorageLayer, uploadService } = emulator;
     if (process.env.STORAGE_EMULATOR_DEBUG) {
         gcloudStorageAPI.use((req, res, next) => {
-            console.log("--------------INCOMING REQUEST--------------");
+            console.log("--------------INCOMING GCS REQUEST--------------");
             console.log(`${req.method.toUpperCase()} ${req.path}`);
             console.log("-- query:");
             console.log(JSON.stringify(req.query, undefined, 2));
@@ -86,7 +85,7 @@ function createCloudEndpoints(emulator) {
             throw err;
         }
         if (req.query.alt === "media") {
-            return sendFileBytes(getObjectResponse.metadata, getObjectResponse.data, req, res);
+            return (0, shared_1.sendFileBytes)(getObjectResponse.metadata, getObjectResponse.data, req, res);
         }
         return res.json(new metadata_1.CloudStorageObjectMetadata(getObjectResponse.metadata));
     });
@@ -110,7 +109,7 @@ function createCloudEndpoints(emulator) {
         }
         return res.json(new metadata_1.CloudStorageObjectMetadata(updatedMetadata));
     });
-    gcloudStorageAPI.get("/b/:bucketId/o", async (req, res) => {
+    gcloudStorageAPI.get(["/b/:bucketId/o", "/storage/v1/b/:bucketId/o"], async (req, res) => {
         var _a;
         let listResponse;
         try {
@@ -228,10 +227,11 @@ function createCloudEndpoints(emulator) {
                 res.sendStatus(400);
                 return;
             }
+            const contentType = req.header("x-upload-content-type");
             const upload = uploadService.startResumableUpload({
                 bucketId: req.params.bucketId,
                 objectId: name,
-                metadataRaw: JSON.stringify(req.body),
+                metadata: Object.assign({ contentType }, req.body),
                 authorization: req.header("authorization"),
             });
             const uploadUrl = registry_1.EmulatorRegistry.url(types_1.Emulators.STORAGE, req);
@@ -256,6 +256,7 @@ function createCloudEndpoints(emulator) {
         }
         if (uploadType === "multipart") {
             const contentTypeHeader = req.header("content-type") || req.header("x-upload-content-type");
+            const contentType = req.header("x-upload-content-type");
             if (!contentTypeHeader) {
                 return res.sendStatus(400);
             }
@@ -283,7 +284,7 @@ function createCloudEndpoints(emulator) {
             const upload = uploadService.multipartUpload({
                 bucketId: req.params.bucketId,
                 objectId: name,
-                metadataRaw: metadataRaw,
+                metadata: Object.assign({ contentType }, JSON.parse(metadataRaw)),
                 dataRaw: dataRaw,
                 authorization: req.header("authorization"),
             });
@@ -318,7 +319,7 @@ function createCloudEndpoints(emulator) {
             }
             throw err;
         }
-        return sendFileBytes(getObjectResponse.metadata, getObjectResponse.data, req, res);
+        return (0, shared_1.sendFileBytes)(getObjectResponse.metadata, getObjectResponse.data, req, res);
     });
     gcloudStorageAPI.post("/b/:bucketId/o/:objectId/:method(rewriteTo|copyTo)/b/:destBucketId/o/:destObjectId", (req, res, next) => {
         if (req.params.method === "rewriteTo" && req.query.rewriteToken) {
@@ -375,31 +376,6 @@ function createCloudEndpoints(emulator) {
     return gcloudStorageAPI;
 }
 exports.createCloudEndpoints = createCloudEndpoints;
-function sendFileBytes(md, data, req, res) {
-    const isGZipped = md.contentEncoding === "gzip";
-    if (isGZipped) {
-        data = (0, zlib_1.gunzipSync)(data);
-    }
-    res.setHeader("Accept-Ranges", "bytes");
-    res.setHeader("Content-Type", md.contentType || "application/octet-stream");
-    res.setHeader("Content-Disposition", md.contentDisposition || "attachment");
-    res.setHeader("Content-Encoding", isGZipped ? "identity" : md.contentEncoding || "");
-    res.setHeader("ETag", md.etag);
-    res.setHeader("Cache-Control", md.cacheControl || "");
-    res.setHeader("x-goog-generation", `${md.generation}`);
-    res.setHeader("x-goog-metadatageneration", `${md.metageneration}`);
-    res.setHeader("x-goog-storage-class", md.storageClass);
-    res.setHeader("x-goog-hash", `crc32c=${(0, crc_1.crc32cToString)(md.crc32c)},md5=${md.md5Hash}`);
-    const byteRange = req.range(data.byteLength, { combine: true });
-    if (Array.isArray(byteRange) && byteRange.type === "bytes" && byteRange.length > 0) {
-        const range = byteRange[0];
-        res.setHeader("Content-Range", `${byteRange.type} ${range.start}-${range.end}/${data.byteLength}`);
-        res.status(206).end(data.slice(range.start, range.end + 1));
-    }
-    else {
-        res.end(data);
-    }
-}
 function sendObjectNotFound(req, res) {
     res.status(404);
     const message = `No such object: ${req.params.bucketId}/${req.params.objectId}`;

package/lib/emulator/storage/apis/shared.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendFileBytes = void 0;
+const zlib_1 = require("zlib");
+const crc_1 = require("../crc");
+function sendFileBytes(md, data, req, res) {
+    let didGunzip = false;
+    if (md.contentEncoding === "gzip") {
+        const acceptEncoding = req.header("accept-encoding") || "";
+        const shouldGunzip = !acceptEncoding.includes("gzip");
+        if (shouldGunzip) {
+            data = (0, zlib_1.gunzipSync)(data);
+            didGunzip = true;
+        }
+    }
+    res.setHeader("Accept-Ranges", "bytes");
+    res.setHeader("Content-Type", md.contentType || "application/octet-stream");
+    res.setHeader("Content-Disposition", md.contentDisposition || "attachment");
+    if (didGunzip) {
+        res.setHeader("Transfer-Encoding", "chunked");
+    }
+    else {
+        res.setHeader("Content-Encoding", md.contentEncoding || "");
+    }
+    res.setHeader("ETag", md.etag);
+    res.setHeader("Cache-Control", md.cacheControl || "");
+    res.setHeader("x-goog-generation", `${md.generation}`);
+    res.setHeader("x-goog-metadatageneration", `${md.metageneration}`);
+    res.setHeader("x-goog-storage-class", md.storageClass);
+    res.setHeader("x-goog-hash", `crc32c=${(0, crc_1.crc32cToString)(md.crc32c)},md5=${md.md5Hash}`);
+    const shouldRespectContentRange = !didGunzip;
+    if (shouldRespectContentRange) {
+        const byteRange = req.range(data.byteLength, { combine: true });
+        if (Array.isArray(byteRange) && byteRange.type === "bytes" && byteRange.length > 0) {
+            const range = byteRange[0];
+            res.setHeader("Content-Range", `${byteRange.type} ${range.start}-${range.end}/${data.byteLength}`);
+            res.status(206).end(data.slice(range.start, range.end + 1));
+            return;
+        }
+    }
+    res.end(data);
+}
+exports.sendFileBytes = sendFileBytes;

package/lib/emulator/storage/rules/config.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStorageRulesConfig = void 0;
 const error_1 = require("../../../error");
 const fsutils_1 = require("../../../fsutils");
+const constants_1 = require("../../constants");
+const types_1 = require("../../types");
+const emulatorLogger_1 = require("../../emulatorLogger");
 function getSourceFile(rules, options) {
     const path = options.config.path(rules);
     return { name: path, content: (0, fsutils_1.readFile)(path) };
@@ -10,6 +13,12 @@ function getSourceFile(rules, options) {
 function getStorageRulesConfig(projectId, options) {
     const storageConfig = options.config.data.storage;
     if (!storageConfig) {
+        if (constants_1.Constants.isDemoProject(projectId)) {
+            const storageLogger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
+            storageLogger.logLabeled("BULLET", "storage", `Detected demo project ID "${projectId}", using a default (open) rules configuration.`);
+            const path = __dirname + "/../../../../templates/emulators/default_storage.rules";
+            return { name: path, content: (0, fsutils_1.readFile)(path) };
+        }
         throw new error_1.FirebaseError("Cannot start the Storage emulator without rules file specified in firebase.json: run 'firebase init' and set up your Storage configuration");
     }
     if (!Array.isArray(storageConfig)) {

package/lib/emulator/storage/upload.js

@@ -50,7 +50,7 @@ class UploadService {
             objectId: request.objectId,
             uploadType: UploadType.MULTIPART,
             dataRaw: request.dataRaw,
-            metadata: JSON.parse(request.metadataRaw),
+            metadata: request.metadata,
             authorization: request.authorization,
         });
         this._persistence.deleteFile(upload.path, true);
@@ -82,7 +82,7 @@ class UploadService {
             type: UploadType.RESUMABLE,
             path: this.getStagingFileName(id, request.bucketId, request.objectId),
             status: UploadStatus.ACTIVE,
-            metadata: JSON.parse(request.metadataRaw),
+            metadata: request.metadata,
             size: 0,
             authorization: request.authorization,
         };

package/lib/experiments.js

@@ -46,9 +46,7 @@ exports.ALL_EXPERIMENTS = experiments({
     },
     functionsparams: {
         shortDescription: "Adds support for paramaterizing functions deployments",
-    },
-    skipdeployingnoopfunctions: {
-        shortDescription: "Detect that there have been no changes to a function and skip deployment",
+        default: true,
     },
     emulatoruisnapshot: {
         shortDescription: "Load pre-release versions of the emulator UI",

package/lib/extensions/provisioningHelper.js

@@ -7,6 +7,7 @@ const apiv2_1 = require("../apiv2");
 const functional_1 = require("../functional");
 const error_1 = require("../error");
 const planner_1 = require("../deploy/extensions/planner");
+const logger_1 = require("../logger");
 var DeferredProduct;
 (function (DeferredProduct) {
     DeferredProduct[DeferredProduct["STORAGE"] = 0] = "STORAGE";
@@ -35,11 +36,16 @@ async function checkProducts(projectId, usedProducts) {
     if (usedProducts.includes(DeferredProduct.AUTH)) {
         isAuthProvisionedPromise = isAuthProvisioned(projectId);
     }
-    if (isStorageProvisionedPromise && !(await isStorageProvisionedPromise)) {
-        needProvisioning.push(DeferredProduct.STORAGE);
+    try {
+        if (isStorageProvisionedPromise && !(await isStorageProvisionedPromise)) {
+            needProvisioning.push(DeferredProduct.STORAGE);
+        }
+        if (isAuthProvisionedPromise && !(await isAuthProvisionedPromise)) {
+            needProvisioning.push(DeferredProduct.AUTH);
+        }
     }
-    if (isAuthProvisionedPromise && !(await isAuthProvisionedPromise)) {
-        needProvisioning.push(DeferredProduct.AUTH);
+    catch (err) {
+        logger_1.logger.debug(`Error while checking product provisioning, failing open: ${err}`);
     }
     if (needProvisioning.length > 0) {
         let errorMessage = "Some services used by this extension have not been set up on your " +

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) => {