@netlify/plugin-nextjs 5.0.0-beta.1 → 5.0.0-beta.2

package/dist/build/content/prerendered.js

@@ -7,7 +7,7 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-G3GM7JNF.js";
+} from "../../esm-chunks/chunk-S5JXJCXP.js";
 import "../../esm-chunks/chunk-AVWFCGVE.js";
 import "../../esm-chunks/chunk-RSKIKBZH.js";
 export {

package/dist/build/content/server.js

@@ -8,7 +8,7 @@ import {
   copyNextDependencies,
   copyNextServerCode,
   writeTagsManifest
-} from "../../esm-chunks/chunk-A22224GM.js";
+} from "../../esm-chunks/chunk-5SZ5JD6J.js";
 import "../../esm-chunks/chunk-AVWFCGVE.js";
 import "../../esm-chunks/chunk-RSKIKBZH.js";
 export {

package/dist/build/functions/edge.js

@@ -6,8 +6,8 @@
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-UXLNY5XK.js";
-import "../../esm-chunks/chunk-VP3PT3VV.js";
+} from "../../esm-chunks/chunk-3PTPU5GO.js";
+import "../../esm-chunks/chunk-TJKO3X6O.js";
 import "../../esm-chunks/chunk-RSKIKBZH.js";
 export {
   createEdgeHandlers

package/dist/build/functions/server.js

@@ -6,10 +6,10 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-NOX2JUQZ.js";
-import "../../esm-chunks/chunk-A22224GM.js";
+} from "../../esm-chunks/chunk-ALO2SSMH.js";
+import "../../esm-chunks/chunk-5SZ5JD6J.js";
 import "../../esm-chunks/chunk-AVWFCGVE.js";
-import "../../esm-chunks/chunk-VP3PT3VV.js";
+import "../../esm-chunks/chunk-TJKO3X6O.js";
 import "../../esm-chunks/chunk-RSKIKBZH.js";
 export {
   createServerHandler

package/dist/build/image-cdn.js

@@ -0,0 +1,13 @@
+
+      const require = await (async () => {
+        const { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+import {
+  setImageConfig
+} from "../esm-chunks/chunk-H46DW7YI.js";
+import "../esm-chunks/chunk-RSKIKBZH.js";
+export {
+  setImageConfig
+};

package/dist/build/plugin-context.js

@@ -8,7 +8,7 @@ import {
   EDGE_HANDLER_NAME,
   PluginContext,
   SERVER_HANDLER_NAME
-} from "../esm-chunks/chunk-VP3PT3VV.js";
+} from "../esm-chunks/chunk-TJKO3X6O.js";
 import "../esm-chunks/chunk-RSKIKBZH.js";
 export {
   EDGE_HANDLER_NAME,

package/dist/esm-chunks/{chunk-UXLNY5XK.js → chunk-3PTPU5GO.js}

@@ -6,7 +6,7 @@
     
 import {
   EDGE_HANDLER_NAME
-} from "./chunk-VP3PT3VV.js";
+} from "./chunk-TJKO3X6O.js";
 
 // src/build/functions/edge.ts
 import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises";

package/dist/esm-chunks/{chunk-A22224GM.js → chunk-5SZ5JD6J.js}

@@ -19,10 +19,13 @@ import { dirname, join } from "node:path";
 var copyNextServerCode = async (ctx) => {
   const srcDir = join(ctx.publishDir, "standalone/.next");
   const destDir = join(ctx.serverHandlerDir, ".next");
-  const paths = await (0, import_fast_glob.default)([`*`, `server/*`, `server/chunks/*`, `server/+(app|pages)/**/*.js`], {
-    cwd: srcDir,
-    extglob: true
-  });
+  const paths = await (0, import_fast_glob.default)(
+    [`*`, `server/*`, `server/chunks/*`, `server/edge-chunks/*`, `server/+(app|pages)/**/*.js`],
+    {
+      cwd: srcDir,
+      extglob: true
+    }
+  );
   await Promise.all(
     paths.map(async (path) => {
       const srcPath = join(srcDir, path);
@@ -77,7 +80,9 @@ var writeTagsManifest = async (ctx) => {
         const meta = JSON.parse(file);
         tags = meta.headers["x-next-cache-tags"];
       } catch {
-        console.log(`Unable to read cache tags for: ${path}`);
+        if (!definition.dataRoute?.endsWith("/default.rsc")) {
+          console.log(`Unable to read cache tags for: ${path}`);
+        }
       }
     }
     if (definition.dataRoute?.endsWith(".json")) {

package/dist/esm-chunks/{chunk-NOX2JUQZ.js → chunk-ALO2SSMH.js}

@@ -8,13 +8,13 @@ import {
   copyNextDependencies,
   copyNextServerCode,
   writeTagsManifest
-} from "./chunk-A22224GM.js";
+} from "./chunk-5SZ5JD6J.js";
 import {
   require_out
 } from "./chunk-AVWFCGVE.js";
 import {
   SERVER_HANDLER_NAME
-} from "./chunk-VP3PT3VV.js";
+} from "./chunk-TJKO3X6O.js";
 import {
   __toESM
 } from "./chunk-RSKIKBZH.js";

package/dist/esm-chunks/chunk-H46DW7YI.js

@@ -0,0 +1,28 @@
+
+      const require = await (async () => {
+        const { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+
+// src/build/image-cdn.ts
+var setImageConfig = async (ctx) => {
+  const {
+    images: { path: imageEndpointPath, loader: imageLoader }
+  } = await ctx.getBuildConfig();
+  if (imageLoader === "default") {
+    ctx.netlifyConfig.redirects.push({
+      from: imageEndpointPath,
+      // w and q are too short to be used as params with id-length rule
+      // but we are forced to do so because of the next/image loader decides on their names
+      // eslint-disable-next-line id-length
+      query: { url: ":url", w: ":width", q: ":quality" },
+      to: "/.netlify/images?url=:url&w=:width&q=:quality",
+      status: 200
+    });
+  }
+};
+
+export {
+  setImageConfig
+};

package/dist/esm-chunks/{chunk-G3GM7JNF.js → chunk-S5JXJCXP.js}

@@ -45,6 +45,8 @@ var copyPrerenderedContent = async (ctx) => {
         const key = routeToFilePath(route);
         let value;
         switch (true) {
+          case (meta.dataRoute?.endsWith("/default.rsc") && !existsSync(join(ctx.publishDir, "server/app", `${key}.html`))):
+            return;
           case meta.dataRoute?.endsWith(".json"):
             value = await buildPagesCacheValue(join(ctx.publishDir, "server/pages", key));
             break;

package/dist/esm-chunks/{chunk-5N2CWXSJ.js → chunk-SMSOJ2OS.js}

@@ -13,6 +13,8 @@ import { Buffer } from "buffer";
 import { env } from "process";
 import { Buffer as Buffer2 } from "buffer";
 import { Buffer as Buffer3 } from "buffer";
+import stream from "stream";
+import { promisify } from "util";
 var getEnvironmentContext = () => {
   const context = globalThis.netlifyBlobsContext || env.NETLIFY_BLOBS_CONTEXT;
   if (typeof context !== "string" || !context) {
@@ -469,6 +471,7 @@ var getDeployStore = (options = {}) => {
   const client = new Client(clientOptions);
   return new Store({ client, deployID });
 };
+var pipeline = promisify(stream.pipeline);
 
 // src/run/headers.ts
 var generateNetlifyVaryValues = ({ headers, languages, cookies }) => {
@@ -555,10 +558,25 @@ var setCacheTagsHeaders = (headers, request, manifest) => {
   const tags = manifest[path];
   headers.set("cache-tag", tags);
 };
+var NEXT_CACHE_TO_CACHE_STATUS = {
+  HIT: `hit`,
+  MISS: `miss,`
+};
+var handleNextCacheHeader = (headers) => {
+  const nextCache = headers.get("x-nextjs-cache");
+  if (typeof nextCache === "string") {
+    if (nextCache in NEXT_CACHE_TO_CACHE_STATUS) {
+      const cacheStatus = NEXT_CACHE_TO_CACHE_STATUS[nextCache];
+      headers.set("cache-status", `"Next.js"; ${cacheStatus}`);
+    }
+    headers.delete("x-nextjs-cache");
+  }
+};
 
 export {
   setVaryHeaders,
   adjustDateHeader,
   setCacheControlHeaders,
-  setCacheTagsHeaders
+  setCacheTagsHeaders,
+  handleNextCacheHeader
 };

package/dist/esm-chunks/{chunk-VP3PT3VV.js → chunk-TJKO3X6O.js}

@@ -17,6 +17,7 @@ var SERVER_HANDLER_NAME = "___netlify-server-handler";
 var EDGE_HANDLER_NAME = "___netlify-edge-handler";
 var PluginContext = class {
   utils;
+  netlifyConfig;
   pluginName;
   pluginVersion;
   constants;
@@ -70,6 +71,7 @@ var PluginContext = class {
     this.pluginVersion = this.packageJSON.version;
     this.constants = options.constants;
     this.utils = options.utils;
+    this.netlifyConfig = options.netlifyConfig;
   }
   /** Resolves a path correctly with mono repository awareness  */
   resolve(...args) {
@@ -87,6 +89,10 @@ var PluginContext = class {
       await readFile(join(this.publishDir, "server/middleware-manifest.json"), "utf-8")
     );
   }
+  /** Get Next Config from build output **/
+  async getBuildConfig() {
+    return JSON.parse(await readFile(join(this.publishDir, "required-server-files.json"), "utf-8")).config;
+  }
   /**
    * Get Next.js routes manifest from the build output
    */

package/dist/index.js

@@ -7,7 +7,7 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "./esm-chunks/chunk-G3GM7JNF.js";
+} from "./esm-chunks/chunk-S5JXJCXP.js";
 import {
   copyStaticAssets,
   copyStaticContent,
@@ -16,19 +16,22 @@ import {
 } from "./esm-chunks/chunk-Z7ZMLVTM.js";
 import {
   createEdgeHandlers
-} from "./esm-chunks/chunk-UXLNY5XK.js";
+} from "./esm-chunks/chunk-3PTPU5GO.js";
 import {
   createServerHandler
-} from "./esm-chunks/chunk-NOX2JUQZ.js";
-import "./esm-chunks/chunk-A22224GM.js";
+} from "./esm-chunks/chunk-ALO2SSMH.js";
+import "./esm-chunks/chunk-5SZ5JD6J.js";
 import "./esm-chunks/chunk-AVWFCGVE.js";
 import {
   restoreBuildCache,
   saveBuildCache
 } from "./esm-chunks/chunk-GGHAQM5D.js";
+import {
+  setImageConfig
+} from "./esm-chunks/chunk-H46DW7YI.js";
 import {
   PluginContext
-} from "./esm-chunks/chunk-VP3PT3VV.js";
+} from "./esm-chunks/chunk-TJKO3X6O.js";
 import "./esm-chunks/chunk-RSKIKBZH.js";
 
 // src/index.ts
@@ -42,6 +45,7 @@ var onBuild = async (options) => {
   if (!existsSync(ctx.publishDir)) {
     ctx.failBuild("Publish directory not found, please check your netlify.toml");
   }
+  await setImageConfig(ctx);
   await saveBuildCache(ctx);
   await Promise.all([
     copyStaticAssets(ctx),

package/dist/run/handlers/cache.cjs

@@ -174,8 +174,8 @@ var require_stream = __commonJS({
     exports2.stream = void 0;
     var node_stream_1 = require("node:stream");
     var node_util_1 = require("node:util");
-    var pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
-    var stream = (handler) => awslambda.streamifyResponse(async (event, responseStream, context) => {
+    var pipeline2 = (0, node_util_1.promisify)(node_stream_1.pipeline);
+    var stream2 = (handler) => awslambda.streamifyResponse(async (event, responseStream, context) => {
       const { body, ...httpResponseMetadata } = await handler(event, context);
       const responseBody = awslambda.HttpResponseStream.from(responseStream, httpResponseMetadata);
       if (typeof body === "undefined") {
@@ -184,10 +184,10 @@ var require_stream = __commonJS({
         responseBody.write(body);
         responseBody.end();
       } else {
-        await pipeline(body, responseBody);
+        await pipeline2(body, responseBody);
       }
     });
-    exports2.stream = stream;
+    exports2.stream = stream2;
   }
 });
 
@@ -249,7 +249,6 @@ var require_main = __commonJS({
 var cache_exports = {};
 __export(cache_exports, {
   NetlifyCacheHandler: () => NetlifyCacheHandler,
-  blobStore: () => blobStore,
   default: () => cache_default
 });
 module.exports = __toCommonJS(cache_exports);
@@ -262,6 +261,8 @@ var import_buffer = require("buffer");
 var import_process = require("process");
 var import_buffer2 = require("buffer");
 var import_buffer3 = require("buffer");
+var import_stream = __toESM(require("stream"), 1);
+var import_util = require("util");
 var getEnvironmentContext = () => {
   const context = globalThis.netlifyBlobsContext || import_process.env.NETLIFY_BLOBS_CONTEXT;
   if (typeof context !== "string" || !context) {
@@ -718,11 +719,11 @@ var getDeployStore = (options = {}) => {
   const client = new Client(clientOptions);
   return new Store({ client, deployID });
 };
+var pipeline = (0, import_util.promisify)(import_stream.default.pipeline);
 
 // src/run/handlers/cache.cts
 var import_functions = __toESM(require_main());
 var import_constants = require("next/dist/lib/constants.js");
-var blobStore = getDeployStore();
 var prerenderManifest = JSON.parse(
   (0, import_node_fs.readFileSync)((0, import_posix.join)(process.cwd(), ".next/prerender-manifest.json"), "utf-8")
 );
@@ -732,17 +733,20 @@ function toRoute(cacheKey) {
 function encodeBlobKey(key) {
   return import_node_buffer.Buffer.from(key.replace(/^\//, "")).toString("base64");
 }
+var fetchBeforeNextPatchedIt = globalThis.fetch;
 var NetlifyCacheHandler = class {
   options;
   revalidatedTags;
+  blobStore;
   constructor(options) {
     this.options = options;
     this.revalidatedTags = options.revalidatedTags;
+    this.blobStore = getDeployStore({ fetch: fetchBeforeNextPatchedIt });
   }
   async get(...args) {
     const [key, ctx = {}] = args;
     console.debug(`[NetlifyCacheHandler.get]: ${key}`);
-    const blob = await blobStore.get(encodeBlobKey(key), {
+    const blob = await this.blobStore.get(encodeBlobKey(key), {
       type: "json"
     });
     if (!blob) {
@@ -786,7 +790,7 @@ var NetlifyCacheHandler = class {
   async set(...args) {
     const [key, data] = args;
     console.debug(`[NetlifyCacheHandler.set]: ${key}`);
-    await blobStore.setJSON(encodeBlobKey(key), {
+    await this.blobStore.setJSON(encodeBlobKey(key), {
       lastModified: Date.now(),
       value: data
     });
@@ -798,7 +802,7 @@ var NetlifyCacheHandler = class {
       revalidatedAt: Date.now()
     };
     try {
-      await blobStore.setJSON(encodeBlobKey(tag), data);
+      await this.blobStore.setJSON(encodeBlobKey(tag), data);
     } catch (error) {
       console.warn(`Failed to update tag manifest for ${tag}`, error);
     }
@@ -814,7 +818,7 @@ var NetlifyCacheHandler = class {
     const cacheTags = [...tags, ...softTags];
     const allManifests = await Promise.all(
       cacheTags.map(async (tag) => {
-        const res = await blobStore.get(encodeBlobKey(tag), { type: "json" }).then((value) => ({ [tag]: value })).catch(console.error);
+        const res = await this.blobStore.get(encodeBlobKey(tag), { type: "json" }).then((value) => ({ [tag]: value })).catch(console.error);
         return res || { [tag]: null };
       })
     );
@@ -847,6 +851,5 @@ var NetlifyCacheHandler = class {
 var cache_default = NetlifyCacheHandler;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  NetlifyCacheHandler,
-  blobStore
+  NetlifyCacheHandler
 });

package/dist/run/handlers/server.js

@@ -4,22 +4,23 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  logger
+} from "../../esm-chunks/chunk-YZXA5QBC.js";
 import {
   getTagsManifest
 } from "../../esm-chunks/chunk-R4NHZWGU.js";
 import "../../esm-chunks/chunk-4AJYXTWN.js";
 import {
   adjustDateHeader,
+  handleNextCacheHeader,
   setCacheControlHeaders,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../../esm-chunks/chunk-5N2CWXSJ.js";
+} from "../../esm-chunks/chunk-SMSOJ2OS.js";
 import {
   nextResponseProxy
 } from "../../esm-chunks/chunk-B6QMRLBH.js";
-import {
-  logger
-} from "../../esm-chunks/chunk-YZXA5QBC.js";
 import {
   __commonJS,
   __toESM
@@ -3287,8 +3288,10 @@ var server_default = async (request) => {
   setCacheControlHeaders(response.headers, request);
   setCacheTagsHeaders(response.headers, request, tagsManifest);
   setVaryHeaders(response.headers, request, nextConfig);
-  if (response.status > 300 && response.status < 400) {
-    return new Response(null, response);
+  handleNextCacheHeader(response.headers);
+  if (response.status > 300 && response.status < 400 || response.status >= 500) {
+    const body = await response.text();
+    return new Response(body || null, response);
   }
   return response;
 };

package/dist/run/headers.js

@@ -6,13 +6,15 @@
     
 import {
   adjustDateHeader,
+  handleNextCacheHeader,
   setCacheControlHeaders,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../esm-chunks/chunk-5N2CWXSJ.js";
+} from "../esm-chunks/chunk-SMSOJ2OS.js";
 import "../esm-chunks/chunk-RSKIKBZH.js";
 export {
   adjustDateHeader,
+  handleNextCacheHeader,
   setCacheControlHeaders,
   setCacheTagsHeaders,
   setVaryHeaders

package/dist/run/next.cjs

@@ -564,6 +564,8 @@ var import_buffer = require("buffer");
 var import_process = require("process");
 var import_buffer2 = require("buffer");
 var import_buffer3 = require("buffer");
+var import_stream = __toESM(require("stream"), 1);
+var import_util = require("util");
 var getEnvironmentContext = () => {
   const context = globalThis.netlifyBlobsContext || import_process.env.NETLIFY_BLOBS_CONTEXT;
   if (typeof context !== "string" || !context) {
@@ -1020,6 +1022,7 @@ var getDeployStore = (options = {}) => {
   const client = new Client(clientOptions);
   return new Store({ client, deployID });
 };
+var pipeline = (0, import_util.promisify)(import_stream.default.pipeline);
 
 // src/run/next.cts
 var import_fs_monkey = __toESM(require_lib());

package/edge-runtime/lib/response.ts

@@ -139,6 +139,7 @@ export const buildResponse = async ({
   }
 
   if (res.headers.get('x-middleware-next') === '1') {
+    res.headers.delete('x-middleware-next')
     return addMiddlewareHeaders(context.next(), res)
   }
   return res

package/package.json

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