@netlify/plugin-nextjs 5.7.0 → 5.7.1

package/dist/build/content/prerendered.js

@@ -148,8 +148,8 @@ var writeCacheEntry = async (route, value, lastModified, ctx) => {
   await writeFile(path, entry, "utf-8");
 };
 var routeToFilePath = (path) => path === "/" ? "/index" : path;
-var buildPagesCacheValue = async (path) => ({
-  kind: "PAGE",
+var buildPagesCacheValue = async (path, shouldUseEnumKind) => ({
+  kind: shouldUseEnumKind ? "PAGES" : "PAGE",
   html: await readFile(`${path}.html`, "utf-8"),
   pageData: JSON.parse(await readFile(`${path}.json`, "utf-8")),
   headers: void 0,
@@ -181,8 +181,8 @@ var buildAppCacheValue = async (path, shouldUseAppPageKind) => {
     ...meta
   };
 };
-var buildRouteCacheValue = async (path, initialRevalidateSeconds) => ({
-  kind: "ROUTE",
+var buildRouteCacheValue = async (path, initialRevalidateSeconds, shouldUseEnumKind) => ({
+  kind: shouldUseEnumKind ? "APP_ROUTE" : "ROUTE",
   body: await readFile(`${path}.body`, "base64"),
   ...JSON.parse(await readFile(`${path}.meta`, "utf-8")),
   revalidate: initialRevalidateSeconds
@@ -200,6 +200,9 @@ var copyPrerenderedContent = async (ctx) => {
       const shouldUseAppPageKind = ctx.nextVersion ? (0, import_semver.satisfies)(ctx.nextVersion, ">=15.0.0-canary.13 <15.0.0-d || >15.0.0-rc.0", {
         includePrerelease: true
       }) : false;
+      const shouldUseEnumKind = ctx.nextVersion ? (0, import_semver.satisfies)(ctx.nextVersion, ">=15.0.0-canary.114 <15.0.0-d || >15.0.0-rc.0", {
+        includePrerelease: true
+      }) : false;
       await Promise.all(
         Object.entries(manifest.routes).map(
           ([route, meta]) => limitConcurrentPrerenderContentHandling(async () => {
@@ -213,7 +216,10 @@ var copyPrerenderedContent = async (ctx) => {
                 if (manifest.notFoundRoutes.includes(route)) {
                   return;
                 }
-                value = await buildPagesCacheValue(join(ctx.publishDir, "server/pages", key));
+                value = await buildPagesCacheValue(
+                  join(ctx.publishDir, "server/pages", key),
+                  shouldUseEnumKind
+                );
                 break;
               case meta.dataRoute?.endsWith(".rsc"):
                 value = await buildAppCacheValue(
@@ -224,13 +230,14 @@ var copyPrerenderedContent = async (ctx) => {
               case meta.dataRoute === null:
                 value = await buildRouteCacheValue(
                   join(ctx.publishDir, "server/app", key),
-                  meta.initialRevalidateSeconds
+                  meta.initialRevalidateSeconds,
+                  shouldUseEnumKind
                 );
                 break;
               default:
                 throw new Error(`Unrecognized content: ${route}`);
             }
-            if (value.kind === "PAGE" || value.kind === "APP_PAGE") {
+            if (value.kind === "PAGE" || value.kind === "PAGES" || value.kind === "APP_PAGE") {
               verifyNetlifyForms(ctx, value.html);
             }
             await writeCacheEntry(key, value, lastModified, ctx);

package/dist/build/functions/edge.js

@@ -390,8 +390,10 @@ var require_dist = __commonJS({
 var import_fast_glob = __toESM(require_out(), 1);
 var import_path_to_regexp = __toESM(require_dist(), 1);
 import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { dirname, join, relative, sep } from "node:path";
+import { sep as posixSep } from "node:path/posix";
 import { EDGE_HANDLER_NAME } from "../plugin-context.js";
+var toPosixPath = (path) => path.split(sep).join(posixSep);
 var writeEdgeManifest = async (ctx, manifest) => {
   await mkdir(ctx.edgeFunctionsDir, { recursive: true });
   await writeFile(join(ctx.edgeFunctionsDir, "manifest.json"), JSON.stringify(manifest, null, 2));
@@ -458,10 +460,16 @@ var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
   const shimPath = join(edgeRuntimeDir, "shim/index.js");
   const shim = await readFile(shimPath, "utf8");
   const parts = [shim];
+  const outputFile = join(destDir, `server/${name}.js`);
   if (wasm?.length) {
-    parts.push(
-      `import { decode as _base64Decode } from "../edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts";`
+    const base64ModulePath = join(
+      destDir,
+      "edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts"
     );
+    const base64ModulePathRelativeToOutputFile = toPosixPath(
+      relative(dirname(outputFile), base64ModulePath)
+    );
+    parts.push(`import { decode as _base64Decode } from "${base64ModulePathRelativeToOutputFile}";`);
     for (const wasmChunk of wasm ?? []) {
       const data = await readFile(join(srcDir, wasmChunk.filePath));
       parts.push(
@@ -477,8 +485,8 @@ var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
 `, entrypoint);
   }
   const exports = `const middlewareEntryKey = Object.keys(_ENTRIES).find(entryKey => entryKey.startsWith("middleware_${name}")); export default _ENTRIES[middlewareEntryKey].default;`;
-  await mkdir(dirname(join(destDir, `server/${name}.js`)), { recursive: true });
-  await writeFile(join(destDir, `server/${name}.js`), [...parts, exports].join("\n"));
+  await mkdir(dirname(outputFile), { recursive: true });
+  await writeFile(outputFile, [...parts, exports].join("\n"));
 };
 var createEdgeHandler = async (ctx, definition) => {
   await copyHandlerDependencies(ctx, definition);

package/dist/esm-chunks/{package-KXKB2T7U.js → package-GZ5FMVI4.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.7.0";
+var version = "5.7.1";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -63,7 +63,7 @@ var devDependencies = {
   "@netlify/edge-functions": "^2.10.0",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.8.1",
-  "@netlify/serverless-functions-api": "^1.22.0",
+  "@netlify/serverless-functions-api": "^1.23.0",
   "@netlify/zip-it-and-ship-it": "^9.37.3",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",

package/dist/run/handlers/cache.cjs

@@ -95,6 +95,7 @@ var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 
 // src/run/handlers/cache.cts
 var import_constants = require("next/dist/lib/constants.js");
+var import_cache_types = require("../../shared/cache-types.cjs");
 var import_regional_blob_store = require("../regional-blob-store.cjs");
 var import_request_context = require("./request-context.cjs");
 var import_tracer = require("./tracer.cjs");
@@ -166,11 +167,11 @@ var NetlifyCacheHandler = class {
     if (requestContext.responseCacheTags) {
       return;
     }
-    if (cacheValue.kind === "PAGE" || cacheValue.kind === "APP_PAGE" || cacheValue.kind === "ROUTE") {
+    if (cacheValue.kind === "PAGE" || cacheValue.kind === "PAGES" || cacheValue.kind === "APP_PAGE" || cacheValue.kind === "ROUTE" || cacheValue.kind === "APP_ROUTE") {
       if (cacheValue.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]) {
         const cacheTags = cacheValue.headers[import_constants.NEXT_CACHE_TAGS_HEADER].split(",");
         requestContext.responseCacheTags = cacheTags;
-      } else if (cacheValue.kind === "PAGE" && typeof cacheValue.pageData === "object") {
+      } else if ((cacheValue.kind === "PAGE" || cacheValue.kind === "PAGES") && typeof cacheValue.pageData === "object") {
         const cacheTags = [`_N_T_${key === "/index" ? "/" : key}`];
         requestContext.responseCacheTags = cacheTags;
       }
@@ -233,8 +234,12 @@ var NetlifyCacheHandler = class {
             lastModified: blob.lastModified,
             value: blob.value
           };
-        case "ROUTE": {
-          span.addEvent("ROUTE", { lastModified: blob.lastModified, status: blob.value.status });
+        case "ROUTE":
+        case "APP_ROUTE": {
+          span.addEvent(blob.value?.kind, {
+            lastModified: blob.lastModified,
+            status: blob.value.status
+          });
           const valueWithoutRevalidate = this.captureRouteRevalidateAndRemoveFromObject(blob.value);
           return {
             lastModified: blob.lastModified,
@@ -244,8 +249,9 @@ var NetlifyCacheHandler = class {
             }
           };
         }
-        case "PAGE": {
-          span.addEvent("PAGE", { lastModified: blob.lastModified });
+        case "PAGE":
+        case "PAGES": {
+          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified });
           const { revalidate, ...restOfPageValue } = blob.value;
           await this.injectEntryToPrerenderManifest(key, revalidate);
           return {
@@ -254,7 +260,7 @@ var NetlifyCacheHandler = class {
           };
         }
         case "APP_PAGE": {
-          span.addEvent("APP_PAGE", { lastModified: blob.lastModified });
+          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified });
           const { revalidate, rscData, ...restOfPageValue } = blob.value;
           await this.injectEntryToPrerenderManifest(key, revalidate);
           return {
@@ -272,14 +278,17 @@ var NetlifyCacheHandler = class {
     });
   }
   transformToStorableObject(data, context) {
-    if (data?.kind === "ROUTE") {
+    if (!data) {
+      return null;
+    }
+    if ((0, import_cache_types.isCachedRouteValue)(data)) {
       return {
         ...data,
         revalidate: context.revalidate,
         body: data.body.toString("base64")
       };
     }
-    if (data?.kind === "PAGE") {
+    if ((0, import_cache_types.isCachedPageValue)(data)) {
       return {
         ...data,
         revalidate: context.revalidate
@@ -307,7 +316,7 @@ var NetlifyCacheHandler = class {
         lastModified,
         value
       });
-      if (data?.kind === "PAGE") {
+      if (data?.kind === "PAGE" || data?.kind === "PAGES") {
         const requestContext = (0, import_request_context.getRequestContext)();
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
           const tag = `_N_T_${key === "/index" ? "/" : key}`;
@@ -360,7 +369,7 @@ var NetlifyCacheHandler = class {
     let cacheTags = [];
     if (cacheEntry.value?.kind === "FETCH") {
       cacheTags = [...tags, ...softTags];
-    } else if (cacheEntry.value?.kind === "PAGE" || cacheEntry.value?.kind === "APP_PAGE" || cacheEntry.value?.kind === "ROUTE") {
+    } else if (cacheEntry.value?.kind === "PAGE" || cacheEntry.value?.kind === "PAGES" || cacheEntry.value?.kind === "APP_PAGE" || cacheEntry.value?.kind === "ROUTE" || cacheEntry.value?.kind === "APP_ROUTE") {
       cacheTags = cacheEntry.value.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]?.split(",") || [];
     } else {
       return false;

package/dist/run/handlers/tracing.js

@@ -67385,7 +67385,7 @@ var import_semantic_conventions = __toESM(require_src(), 1);
 import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-KXKB2T7U.js");
+} = await import("../../esm-chunks/package-GZ5FMVI4.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,

package/dist/run/next.cjs

@@ -494,6 +494,7 @@ var import_fs_monkey = __toESM(require_lib());
 var import_request_context = require("./handlers/request-context.cjs");
 var import_tracer = require("./handlers/tracer.cjs");
 var import_regional_blob_store = require("./regional-blob-store.cjs");
+process.env.NODE_ENV = "production";
 console.time("import next server");
 var { getRequestHandlers } = require("next/dist/server/lib/start-server.js");
 var ResponseCache = require("next/dist/server/response-cache/index.js").default;

package/dist/shared/cache-types.cjs

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -15,4 +19,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 
 // src/shared/cache-types.cts
 var cache_types_exports = {};
+__export(cache_types_exports, {
+  isCachedPageValue: () => isCachedPageValue,
+  isCachedRouteValue: () => isCachedRouteValue
+});
 module.exports = __toCommonJS(cache_types_exports);
+var isCachedPageValue = (value) => value.kind === "PAGE" || value.kind === "PAGES";
+var isCachedRouteValue = (value) => value.kind === "ROUTE" || value.kind === "APP_ROUTE";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isCachedPageValue,
+  isCachedRouteValue
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",