@netlify/plugin-nextjs 5.11.1 → 5.11.3

package/dist/build/content/prerendered.js

@@ -13,7 +13,7 @@ import {
 } from "../../esm-chunks/chunk-YUXQHOYO.js";
 import {
   require_semver
-} from "../../esm-chunks/chunk-F7NTXMLE.js";
+} from "../../esm-chunks/chunk-TLQCAGE2.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-6BT4RYQJ.js";

package/dist/build/content/server.js

@@ -13,7 +13,7 @@ import {
 } from "../../esm-chunks/chunk-YUXQHOYO.js";
 import {
   require_semver
-} from "../../esm-chunks/chunk-F7NTXMLE.js";
+} from "../../esm-chunks/chunk-TLQCAGE2.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-6BT4RYQJ.js";
@@ -215,7 +215,26 @@ var replaceMiddlewareManifest = async (sourcePath, destPath) => {
   const manifest = JSON.parse(data);
   const newManifest = {
     ...manifest,
-    middleware: {}
+    middleware: Object.fromEntries(
+      Object.entries(manifest.middleware).map(([key, edgeFunctionDefinition]) => {
+        return [
+          key,
+          {
+            ...edgeFunctionDefinition,
+            matchers: edgeFunctionDefinition.matchers.map((matcher) => {
+              return {
+                ...matcher,
+                // matcher that won't match on anything
+                // this is meant to disable actually running middleware in the server handler,
+                // while still allowing next server to enable some middleware specific handling
+                // such as _next/data normalization ( https://github.com/vercel/next.js/blob/7bb72e508572237fe0d4aac5418546d4b4b3a363/packages/next/src/server/lib/router-utils/resolve-routes.ts#L395 )
+                regexp: "(?!.*)"
+              };
+            })
+          }
+        ];
+      })
+    )
   };
   const newData = JSON.stringify(newManifest);
   await writeFile(destPath, newData);

package/dist/build/content/static.js

@@ -32,16 +32,18 @@ var copyStaticContent = async (ctx) => {
       extglob: true
     });
     const fallbacks = ctx.getFallbacks(await ctx.getPrerenderManifest());
+    const fullyStaticPages = await ctx.getFullyStaticHtmlPages();
     try {
       await mkdir(destDir, { recursive: true });
       await Promise.all(
-        paths.filter((path) => !paths.includes(`${path.slice(0, -5)}.json`)).map(async (path) => {
+        paths.filter((path) => !path.endsWith(".json") && !paths.includes(`${path.slice(0, -5)}.json`)).map(async (path) => {
           const html = await readFile(join(srcDir, path), "utf-8");
           verifyNetlifyForms(ctx, html);
           const isFallback = fallbacks.includes(path.slice(0, -5));
+          const isFullyStaticPage = !isFallback && fullyStaticPages.includes(path);
           await writeFile(
             join(destDir, await encodeBlobKey(path)),
-            JSON.stringify({ html, isFallback }),
+            JSON.stringify({ html, isFullyStaticPage }),
             "utf-8"
           );
         })

package/dist/build/functions/edge.js

@@ -487,7 +487,7 @@ var writeHandlerFile = async (ctx, { matchers, name }) => {
     `
   );
 };
-var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
+var copyHandlerDependencies = async (ctx, { name, env, files, wasm }) => {
   const srcDir = join(ctx.standaloneDir, ctx.nextDistDir);
   const destDir = join(ctx.edgeFunctionsDir, getHandlerName({ name }));
   const edgeRuntimeDir = join(ctx.pluginDir, "edge-runtime");
@@ -495,6 +495,11 @@ var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
   const shim = await readFile(shimPath, "utf8");
   const parts = [shim];
   const outputFile = join(destDir, `server/${name}.js`);
+  if (env) {
+    for (const [key, value] of Object.entries(env)) {
+      parts.push(`process.env.${key} = '${value}';`);
+    }
+  }
   if (wasm?.length) {
     for (const wasmChunk of wasm ?? []) {
       const data = await readFile(join(srcDir, wasmChunk.filePath));
@@ -516,13 +521,13 @@ var createEdgeHandler = async (ctx, definition) => {
 };
 var getHandlerName = ({ name }) => `${EDGE_HANDLER_NAME}-${name.replace(/\W/g, "-")}`;
 var buildHandlerDefinition = (ctx, { name, matchers, page }) => {
-  const fun = getHandlerName({ name });
-  const funName = name.endsWith("middleware") ? "Next.js Middleware Handler" : `Next.js Edge Handler: ${page}`;
+  const functionHandlerName = getHandlerName({ name });
+  const functionName = name.endsWith("middleware") ? "Next.js Middleware Handler" : `Next.js Edge Handler: ${page}`;
   const cache = name.endsWith("middleware") ? void 0 : "manual";
   const generator = `${ctx.pluginName}@${ctx.pluginVersion}`;
   return augmentMatchers(matchers, ctx).map((matcher) => ({
-    function: fun,
-    name: funName,
+    function: functionHandlerName,
+    name: functionName,
     pattern: matcher.regexp,
     cache,
     generator
@@ -533,10 +538,7 @@ var clearStaleEdgeHandlers = async (ctx) => {
 };
 var createEdgeHandlers = async (ctx) => {
   const nextManifest = await ctx.getMiddlewareManifest();
-  const nextDefinitions = [
-    ...Object.values(nextManifest.middleware)
-    // ...Object.values(nextManifest.functions)
-  ];
+  const nextDefinitions = [...Object.values(nextManifest.middleware)];
   await Promise.all(nextDefinitions.map((def) => createEdgeHandler(ctx, def)));
   const netlifyDefinitions = nextDefinitions.flatMap((def) => buildHandlerDefinition(ctx, def));
   const netlifyManifest = {

package/dist/build/plugin-context.js

@@ -6,7 +6,7 @@
     
 import {
   require_semver
-} from "../esm-chunks/chunk-F7NTXMLE.js";
+} from "../esm-chunks/chunk-TLQCAGE2.js";
 import {
   __toESM
 } from "../esm-chunks/chunk-6BT4RYQJ.js";
@@ -17,7 +17,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { join, relative, resolve } from "node:path";
-import { join as posixJoin } from "node:path/posix";
+import { join as posixJoin, relative as posixRelative } from "node:path/posix";
 import { fileURLToPath } from "node:url";
 var MODULE_DIR = fileURLToPath(new URL(".", import.meta.url));
 var PLUGIN_DIR = join(MODULE_DIR, "../..");
@@ -292,6 +292,29 @@ var PluginContext = class {
     }
     return this.#fallbacks;
   }
+  #fullyStaticHtmlPages = null;
+  /**
+   * Get an array of fully static pages router pages (no `getServerSideProps` or `getStaticProps`).
+   * Those are being served as-is without involving CacheHandler, so we need to keep track of them
+   * to make sure we apply permanent caching headers for responses that use them.
+   */
+  async getFullyStaticHtmlPages() {
+    if (!this.#fullyStaticHtmlPages) {
+      const pagesManifest = JSON.parse(
+        await readFile(join(this.publishDir, "server/pages-manifest.json"), "utf-8")
+      );
+      this.#fullyStaticHtmlPages = Object.values(pagesManifest).filter(
+        (filePath) => (
+          // Limit handling to pages router files (App Router pages should not be included in pages-manifest.json
+          // as they have their own app-paths-manifest.json)
+          filePath.startsWith("pages/") && // Fully static pages will have entries in the pages-manifest.json pointing to .html files.
+          // Pages with data fetching exports will point to .js files.
+          filePath.endsWith(".html")
+        )
+      ).map((filePath) => posixRelative("pages", filePath));
+    }
+    return this.#fullyStaticHtmlPages;
+  }
   /** Fails a build with a message and an optional error */
   failBuild(message, error) {
     return this.utils.build.failBuild(message, error instanceof Error ? { error } : void 0);

package/dist/build/verification.js

@@ -9,7 +9,7 @@ import {
 } from "../esm-chunks/chunk-YUXQHOYO.js";
 import {
   require_semver
-} from "../esm-chunks/chunk-F7NTXMLE.js";
+} from "../esm-chunks/chunk-TLQCAGE2.js";
 import {
   __toESM
 } from "../esm-chunks/chunk-6BT4RYQJ.js";

package/dist/esm-chunks/{chunk-F7NTXMLE.js → chunk-TLQCAGE2.js}

@@ -11,6 +11,7 @@ import {
 // node_modules/semver/internal/constants.js
 var require_constants = __commonJS({
   "node_modules/semver/internal/constants.js"(exports, module) {
+    "use strict";
     var SEMVER_SPEC_VERSION = "2.0.0";
     var MAX_LENGTH = 256;
     var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */
@@ -42,6 +43,7 @@ var require_constants = __commonJS({
 // node_modules/semver/internal/debug.js
 var require_debug = __commonJS({
   "node_modules/semver/internal/debug.js"(exports, module) {
+    "use strict";
     var debug = typeof process === "object" && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? (...args) => console.error("SEMVER", ...args) : () => {
     };
     module.exports = debug;
@@ -51,6 +53,7 @@ var require_debug = __commonJS({
 // node_modules/semver/internal/re.js
 var require_re = __commonJS({
   "node_modules/semver/internal/re.js"(exports, module) {
+    "use strict";
     var {
       MAX_SAFE_COMPONENT_LENGTH,
       MAX_SAFE_BUILD_LENGTH,
@@ -91,8 +94,8 @@ var require_re = __commonJS({
     createToken("NONNUMERICIDENTIFIER", `\\d*[a-zA-Z-]${LETTERDASHNUMBER}*`);
     createToken("MAINVERSION", `(${src[t.NUMERICIDENTIFIER]})\\.(${src[t.NUMERICIDENTIFIER]})\\.(${src[t.NUMERICIDENTIFIER]})`);
     createToken("MAINVERSIONLOOSE", `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.(${src[t.NUMERICIDENTIFIERLOOSE]})\\.(${src[t.NUMERICIDENTIFIERLOOSE]})`);
-    createToken("PRERELEASEIDENTIFIER", `(?:${src[t.NUMERICIDENTIFIER]}|${src[t.NONNUMERICIDENTIFIER]})`);
-    createToken("PRERELEASEIDENTIFIERLOOSE", `(?:${src[t.NUMERICIDENTIFIERLOOSE]}|${src[t.NONNUMERICIDENTIFIER]})`);
+    createToken("PRERELEASEIDENTIFIER", `(?:${src[t.NONNUMERICIDENTIFIER]}|${src[t.NUMERICIDENTIFIER]})`);
+    createToken("PRERELEASEIDENTIFIERLOOSE", `(?:${src[t.NONNUMERICIDENTIFIER]}|${src[t.NUMERICIDENTIFIERLOOSE]})`);
     createToken("PRERELEASE", `(?:-(${src[t.PRERELEASEIDENTIFIER]}(?:\\.${src[t.PRERELEASEIDENTIFIER]})*))`);
     createToken("PRERELEASELOOSE", `(?:-?(${src[t.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${src[t.PRERELEASEIDENTIFIERLOOSE]})*))`);
     createToken("BUILDIDENTIFIER", `${LETTERDASHNUMBER}+`);
@@ -138,6 +141,7 @@ var require_re = __commonJS({
 // node_modules/semver/internal/parse-options.js
 var require_parse_options = __commonJS({
   "node_modules/semver/internal/parse-options.js"(exports, module) {
+    "use strict";
     var looseOption = Object.freeze({ loose: true });
     var emptyOpts = Object.freeze({});
     var parseOptions = (options) => {
@@ -156,6 +160,7 @@ var require_parse_options = __commonJS({
 // node_modules/semver/internal/identifiers.js
 var require_identifiers = __commonJS({
   "node_modules/semver/internal/identifiers.js"(exports, module) {
+    "use strict";
     var numeric = /^[0-9]+$/;
     var compareIdentifiers = (a, b) => {
       const anum = numeric.test(a);
@@ -177,9 +182,10 @@ var require_identifiers = __commonJS({
 // node_modules/semver/classes/semver.js
 var require_semver = __commonJS({
   "node_modules/semver/classes/semver.js"(exports, module) {
+    "use strict";
     var debug = require_debug();
     var { MAX_LENGTH, MAX_SAFE_INTEGER } = require_constants();
-    var { safeRe: re, safeSrc: src, t } = require_re();
+    var { safeRe: re, t } = require_re();
     var parseOptions = require_parse_options();
     var { compareIdentifiers } = require_identifiers();
     var SemVer = class _SemVer {
@@ -324,8 +330,7 @@ var require_semver = __commonJS({
             throw new Error("invalid increment argument: identifier is empty");
           }
           if (identifier) {
-            const r = new RegExp(`^${this.options.loose ? src[t.PRERELEASELOOSE] : src[t.PRERELEASE]}$`);
-            const match = `-${identifier}`.match(r);
+            const match = `-${identifier}`.match(this.options.loose ? re[t.PRERELEASELOOSE] : re[t.PRERELEASE]);
             if (!match || match[1] !== identifier) {
               throw new Error(`invalid identifier: ${identifier}`);
             }
@@ -438,6 +443,7 @@ var require_semver = __commonJS({
 // node_modules/semver/functions/parse.js
 var require_parse = __commonJS({
   "node_modules/semver/functions/parse.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var parse = (version, options, throwErrors = false) => {
       if (version instanceof SemVer) {
@@ -459,6 +465,7 @@ var require_parse = __commonJS({
 // node_modules/semver/functions/valid.js
 var require_valid = __commonJS({
   "node_modules/semver/functions/valid.js"(exports, module) {
+    "use strict";
     var parse = require_parse();
     var valid = (version, options) => {
       const v = parse(version, options);
@@ -471,6 +478,7 @@ var require_valid = __commonJS({
 // node_modules/semver/functions/clean.js
 var require_clean = __commonJS({
   "node_modules/semver/functions/clean.js"(exports, module) {
+    "use strict";
     var parse = require_parse();
     var clean = (version, options) => {
       const s = parse(version.trim().replace(/^[=v]+/, ""), options);
@@ -483,6 +491,7 @@ var require_clean = __commonJS({
 // node_modules/semver/functions/inc.js
 var require_inc = __commonJS({
   "node_modules/semver/functions/inc.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var inc = (version, release, options, identifier, identifierBase) => {
       if (typeof options === "string") {
@@ -506,6 +515,7 @@ var require_inc = __commonJS({
 // node_modules/semver/functions/diff.js
 var require_diff = __commonJS({
   "node_modules/semver/functions/diff.js"(exports, module) {
+    "use strict";
     var parse = require_parse();
     var diff = (version1, version2) => {
       const v1 = parse(version1, null, true);
@@ -549,6 +559,7 @@ var require_diff = __commonJS({
 // node_modules/semver/functions/major.js
 var require_major = __commonJS({
   "node_modules/semver/functions/major.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var major = (a, loose) => new SemVer(a, loose).major;
     module.exports = major;
@@ -558,6 +569,7 @@ var require_major = __commonJS({
 // node_modules/semver/functions/minor.js
 var require_minor = __commonJS({
   "node_modules/semver/functions/minor.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var minor = (a, loose) => new SemVer(a, loose).minor;
     module.exports = minor;
@@ -567,6 +579,7 @@ var require_minor = __commonJS({
 // node_modules/semver/functions/patch.js
 var require_patch = __commonJS({
   "node_modules/semver/functions/patch.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var patch = (a, loose) => new SemVer(a, loose).patch;
     module.exports = patch;
@@ -576,6 +589,7 @@ var require_patch = __commonJS({
 // node_modules/semver/functions/prerelease.js
 var require_prerelease = __commonJS({
   "node_modules/semver/functions/prerelease.js"(exports, module) {
+    "use strict";
     var parse = require_parse();
     var prerelease = (version, options) => {
       const parsed = parse(version, options);
@@ -588,6 +602,7 @@ var require_prerelease = __commonJS({
 // node_modules/semver/functions/compare.js
 var require_compare = __commonJS({
   "node_modules/semver/functions/compare.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
     module.exports = compare;
@@ -597,6 +612,7 @@ var require_compare = __commonJS({
 // node_modules/semver/functions/rcompare.js
 var require_rcompare = __commonJS({
   "node_modules/semver/functions/rcompare.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var rcompare = (a, b, loose) => compare(b, a, loose);
     module.exports = rcompare;
@@ -606,6 +622,7 @@ var require_rcompare = __commonJS({
 // node_modules/semver/functions/compare-loose.js
 var require_compare_loose = __commonJS({
   "node_modules/semver/functions/compare-loose.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var compareLoose = (a, b) => compare(a, b, true);
     module.exports = compareLoose;
@@ -615,6 +632,7 @@ var require_compare_loose = __commonJS({
 // node_modules/semver/functions/compare-build.js
 var require_compare_build = __commonJS({
   "node_modules/semver/functions/compare-build.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var compareBuild = (a, b, loose) => {
       const versionA = new SemVer(a, loose);
@@ -628,6 +646,7 @@ var require_compare_build = __commonJS({
 // node_modules/semver/functions/sort.js
 var require_sort = __commonJS({
   "node_modules/semver/functions/sort.js"(exports, module) {
+    "use strict";
     var compareBuild = require_compare_build();
     var sort = (list, loose) => list.sort((a, b) => compareBuild(a, b, loose));
     module.exports = sort;
@@ -637,6 +656,7 @@ var require_sort = __commonJS({
 // node_modules/semver/functions/rsort.js
 var require_rsort = __commonJS({
   "node_modules/semver/functions/rsort.js"(exports, module) {
+    "use strict";
     var compareBuild = require_compare_build();
     var rsort = (list, loose) => list.sort((a, b) => compareBuild(b, a, loose));
     module.exports = rsort;
@@ -646,6 +666,7 @@ var require_rsort = __commonJS({
 // node_modules/semver/functions/gt.js
 var require_gt = __commonJS({
   "node_modules/semver/functions/gt.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var gt = (a, b, loose) => compare(a, b, loose) > 0;
     module.exports = gt;
@@ -655,6 +676,7 @@ var require_gt = __commonJS({
 // node_modules/semver/functions/lt.js
 var require_lt = __commonJS({
   "node_modules/semver/functions/lt.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var lt = (a, b, loose) => compare(a, b, loose) < 0;
     module.exports = lt;
@@ -664,6 +686,7 @@ var require_lt = __commonJS({
 // node_modules/semver/functions/eq.js
 var require_eq = __commonJS({
   "node_modules/semver/functions/eq.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var eq = (a, b, loose) => compare(a, b, loose) === 0;
     module.exports = eq;
@@ -673,6 +696,7 @@ var require_eq = __commonJS({
 // node_modules/semver/functions/neq.js
 var require_neq = __commonJS({
   "node_modules/semver/functions/neq.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var neq = (a, b, loose) => compare(a, b, loose) !== 0;
     module.exports = neq;
@@ -682,6 +706,7 @@ var require_neq = __commonJS({
 // node_modules/semver/functions/gte.js
 var require_gte = __commonJS({
   "node_modules/semver/functions/gte.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var gte = (a, b, loose) => compare(a, b, loose) >= 0;
     module.exports = gte;
@@ -691,6 +716,7 @@ var require_gte = __commonJS({
 // node_modules/semver/functions/lte.js
 var require_lte = __commonJS({
   "node_modules/semver/functions/lte.js"(exports, module) {
+    "use strict";
     var compare = require_compare();
     var lte = (a, b, loose) => compare(a, b, loose) <= 0;
     module.exports = lte;
@@ -700,6 +726,7 @@ var require_lte = __commonJS({
 // node_modules/semver/functions/cmp.js
 var require_cmp = __commonJS({
   "node_modules/semver/functions/cmp.js"(exports, module) {
+    "use strict";
     var eq = require_eq();
     var neq = require_neq();
     var gt = require_gt();
@@ -749,6 +776,7 @@ var require_cmp = __commonJS({
 // node_modules/semver/functions/coerce.js
 var require_coerce = __commonJS({
   "node_modules/semver/functions/coerce.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var parse = require_parse();
     var { safeRe: re, t } = require_re();
@@ -794,6 +822,7 @@ var require_coerce = __commonJS({
 // node_modules/semver/internal/lrucache.js
 var require_lrucache = __commonJS({
   "node_modules/semver/internal/lrucache.js"(exports, module) {
+    "use strict";
     var LRUCache = class {
       constructor() {
         this.max = 1e3;
@@ -831,6 +860,7 @@ var require_lrucache = __commonJS({
 // node_modules/semver/classes/range.js
 var require_range = __commonJS({
   "node_modules/semver/classes/range.js"(exports, module) {
+    "use strict";
     var SPACE_CHARACTERS = /\s+/g;
     var Range = class _Range {
       constructor(range, options) {
@@ -1206,6 +1236,7 @@ var require_range = __commonJS({
 // node_modules/semver/classes/comparator.js
 var require_comparator = __commonJS({
   "node_modules/semver/classes/comparator.js"(exports, module) {
+    "use strict";
     var ANY = Symbol("SemVer ANY");
     var Comparator = class _Comparator {
       static get ANY() {
@@ -1318,6 +1349,7 @@ var require_comparator = __commonJS({
 // node_modules/semver/functions/satisfies.js
 var require_satisfies = __commonJS({
   "node_modules/semver/functions/satisfies.js"(exports, module) {
+    "use strict";
     var Range = require_range();
     var satisfies = (version, range, options) => {
       try {
@@ -1334,6 +1366,7 @@ var require_satisfies = __commonJS({
 // node_modules/semver/ranges/to-comparators.js
 var require_to_comparators = __commonJS({
   "node_modules/semver/ranges/to-comparators.js"(exports, module) {
+    "use strict";
     var Range = require_range();
     var toComparators = (range, options) => new Range(range, options).set.map((comp) => comp.map((c) => c.value).join(" ").trim().split(" "));
     module.exports = toComparators;
@@ -1343,6 +1376,7 @@ var require_to_comparators = __commonJS({
 // node_modules/semver/ranges/max-satisfying.js
 var require_max_satisfying = __commonJS({
   "node_modules/semver/ranges/max-satisfying.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var Range = require_range();
     var maxSatisfying = (versions, range, options) => {
@@ -1371,6 +1405,7 @@ var require_max_satisfying = __commonJS({
 // node_modules/semver/ranges/min-satisfying.js
 var require_min_satisfying = __commonJS({
   "node_modules/semver/ranges/min-satisfying.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var Range = require_range();
     var minSatisfying = (versions, range, options) => {
@@ -1399,6 +1434,7 @@ var require_min_satisfying = __commonJS({
 // node_modules/semver/ranges/min-version.js
 var require_min_version = __commonJS({
   "node_modules/semver/ranges/min-version.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var Range = require_range();
     var gt = require_gt();
@@ -1457,6 +1493,7 @@ var require_min_version = __commonJS({
 // node_modules/semver/ranges/valid.js
 var require_valid2 = __commonJS({
   "node_modules/semver/ranges/valid.js"(exports, module) {
+    "use strict";
     var Range = require_range();
     var validRange = (range, options) => {
       try {
@@ -1472,6 +1509,7 @@ var require_valid2 = __commonJS({
 // node_modules/semver/ranges/outside.js
 var require_outside = __commonJS({
   "node_modules/semver/ranges/outside.js"(exports, module) {
+    "use strict";
     var SemVer = require_semver();
     var Comparator = require_comparator();
     var { ANY } = Comparator;
@@ -1540,6 +1578,7 @@ var require_outside = __commonJS({
 // node_modules/semver/ranges/gtr.js
 var require_gtr = __commonJS({
   "node_modules/semver/ranges/gtr.js"(exports, module) {
+    "use strict";
     var outside = require_outside();
     var gtr = (version, range, options) => outside(version, range, ">", options);
     module.exports = gtr;
@@ -1549,6 +1588,7 @@ var require_gtr = __commonJS({
 // node_modules/semver/ranges/ltr.js
 var require_ltr = __commonJS({
   "node_modules/semver/ranges/ltr.js"(exports, module) {
+    "use strict";
     var outside = require_outside();
     var ltr = (version, range, options) => outside(version, range, "<", options);
     module.exports = ltr;
@@ -1558,6 +1598,7 @@ var require_ltr = __commonJS({
 // node_modules/semver/ranges/intersects.js
 var require_intersects = __commonJS({
   "node_modules/semver/ranges/intersects.js"(exports, module) {
+    "use strict";
     var Range = require_range();
     var intersects = (r1, r2, options) => {
       r1 = new Range(r1, options);
@@ -1571,6 +1612,7 @@ var require_intersects = __commonJS({
 // node_modules/semver/ranges/simplify.js
 var require_simplify = __commonJS({
   "node_modules/semver/ranges/simplify.js"(exports, module) {
+    "use strict";
     var satisfies = require_satisfies();
     var compare = require_compare();
     module.exports = (versions, range, options) => {
@@ -1620,6 +1662,7 @@ var require_simplify = __commonJS({
 // node_modules/semver/ranges/subset.js
 var require_subset = __commonJS({
   "node_modules/semver/ranges/subset.js"(exports, module) {
+    "use strict";
     var Range = require_range();
     var Comparator = require_comparator();
     var { ANY } = Comparator;
@@ -1781,6 +1824,7 @@ var require_subset = __commonJS({
 // node_modules/semver/index.js
 var require_semver2 = __commonJS({
   "node_modules/semver/index.js"(exports, module) {
+    "use strict";
     var internalRe = require_re();
     var constants = require_constants();
     var SemVer = require_semver();

package/dist/run/handlers/tags-handler.cjs

@@ -86,7 +86,7 @@ var pipeline = (0, import_node_util.promisify)(import_node_stream.pipeline);
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.11.1";
+var version = "5.11.3";
 
 // src/run/handlers/tags-handler.cts
 var import_storage = require("../storage/storage.cjs");

package/dist/run/next.cjs

@@ -488,8 +488,9 @@ __export(next_exports, {
   getMockedRequestHandler: () => getMockedRequestHandler
 });
 module.exports = __toCommonJS(next_exports);
-var import_promises = __toESM(require("fs/promises"));
-var import_path = require("path");
+var import_node_async_hooks = require("node:async_hooks");
+var import_promises = __toESM(require("node:fs/promises"));
+var import_node_path = require("node:path");
 var import_fs_monkey = __toESM(require_lib());
 var import_request_context = require("./handlers/request-context.cjs");
 var import_tracer = require("./handlers/tracer.cjs");
@@ -540,6 +541,8 @@ ResponseCache.prototype.get = function get(...getArgs) {
   return originalGet.apply(this, getArgs);
 };
 async function getMockedRequestHandler(...args) {
+  const initContext = { initializingServer: true };
+  const initAsyncLocalStorage = new import_node_async_hooks.AsyncLocalStorage();
   const tracer = (0, import_tracer.getTracer)();
   return tracer.withActiveSpan("mocked request handler", async () => {
     const ofs = { ...import_promises.default };
@@ -550,12 +553,13 @@ async function getMockedRequestHandler(...args) {
       } catch (error) {
         if (typeof path === "string" && path.endsWith(".html")) {
           const cacheStore = (0, import_storage.getMemoizedKeyValueStoreBackedByRegionalBlobStore)();
-          const relPath = (0, import_path.relative)((0, import_path.resolve)(".next/server/pages"), path);
+          const relPath = (0, import_node_path.relative)((0, import_node_path.resolve)(".next/server/pages"), path);
           const file = await cacheStore.get(relPath, "staticHtml.get");
           if (file !== null) {
-            if (!file.isFallback) {
+            if (file.isFullyStaticPage) {
               const requestContext = (0, import_request_context.getRequestContext)();
-              if (requestContext) {
+              const { initializingServer } = initAsyncLocalStorage.getStore() ?? {};
+              if (!initializingServer && requestContext) {
                 requestContext.usedFsReadForNonFallback = true;
               }
             }
@@ -572,7 +576,9 @@ async function getMockedRequestHandler(...args) {
       // eslint-disable-next-line n/global-require, @typescript-eslint/no-var-requires
       require("fs").promises
     );
-    const requestHandlers = await getRequestHandlers(...args);
+    const requestHandlers = await initAsyncLocalStorage.run(initContext, async () => {
+      return await getRequestHandlers(...args);
+    });
     return Array.isArray(requestHandlers) ? requestHandlers[0] : requestHandlers.requestHandler;
   });
 }

package/dist/shared/blob-types.cjs

@@ -28,7 +28,7 @@ var isTagManifest = (value) => {
   return typeof value === "object" && value !== null && "revalidatedAt" in value && typeof value.revalidatedAt === "number" && Object.keys(value).length === 1;
 };
 var isHtmlBlob = (value) => {
-  return typeof value === "object" && value !== null && "html" in value && "isFallback" in value && typeof value.html === "string" && typeof value.isFallback === "boolean" && Object.keys(value).length === 2;
+  return typeof value === "object" && value !== null && "html" in value && "isFullyStaticPage" in value && typeof value.html === "string" && typeof value.isFullyStaticPage === "boolean" && Object.keys(value).length === 2;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/edge-runtime/lib/middleware.ts

@@ -67,6 +67,10 @@ export function mergeMiddlewareCookies(middlewareResponse: Response, lambdaReque
   const middlewareCookies = middlewareResponse.headers.get('x-middleware-set-cookie')
 
   if (middlewareCookies) {
+    // Next expects internal headers to be omitted when cookies are set by the middleware
+    // See: https://github.com/vercel/next.js/blob/005db43079c7b59fd8c2594e8362761dc4cb3211/test/e2e/app-dir/app-middleware/app-middleware.test.ts#L197-L207
+    middlewareResponse.headers.delete('x-middleware-set-cookie')
+
     // Targets commas that are not followed by whitespace
     // See: https://github.com/vercel/next.js/blob/e6145d3a37bb4c7b481fd58e05cdff9046ace8ad/packages/next/src/server/web/spec-extension/response.ts#L58-L66
     const regex = new RegExp(/,(?!\s)/)

package/edge-runtime/lib/response.ts

@@ -163,25 +163,13 @@ export const buildResponse = async ({
 
     if (rewriteUrl.origin !== baseUrl.origin) {
       logger.withFields({ rewrite_url: rewrite }).debug('Rewriting to external url')
-      let proxyRequest: Request
+      const proxyRequest = await cloneRequest(rewriteUrl, request)
 
       // Remove Netlify internal headers
-      const headers = new Headers(
-        [...request.headers.entries()].filter(([key]) => !key.startsWith('x-nf-')),
-      )
-      if (request.body && !request.bodyUsed) {
-        // This is not ideal, but streaming to an external URL doesn't work
-        const body = await request.arrayBuffer()
-        proxyRequest = new Request(rewriteUrl, {
-          headers,
-          method: request.method,
-          body,
-        })
-      } else {
-        proxyRequest = new Request(rewriteUrl, {
-          headers,
-          method: request.method,
-        })
+      for (const key of request.headers.keys()) {
+        if (key.startsWith('x-nf-')) {
+          proxyRequest.headers.delete(key)
+        }
       }
 
       return addMiddlewareHeaders(fetch(proxyRequest, { redirect: 'manual' }), edgeResponse)
@@ -207,7 +195,7 @@ export const buildResponse = async ({
     request.headers.set('x-middleware-rewrite', target)
 
     // coookies set in middleware need to be available during the lambda request
-    const newRequest = new Request(target, request)
+    const newRequest = await cloneRequest(target, request)
     const newRequestCookies = mergeMiddlewareCookies(edgeResponse, newRequest)
     if (newRequestCookies) {
       newRequest.headers.set('Cookie', newRequestCookies)
@@ -241,7 +229,7 @@ export const buildResponse = async ({
     edgeResponse.headers.delete('x-middleware-next')
 
     // coookies set in middleware need to be available during the lambda request
-    const newRequest = new Request(request)
+    const newRequest = await cloneRequest(request.url, request)
     const newRequestCookies = mergeMiddlewareCookies(edgeResponse, newRequest)
     if (newRequestCookies) {
       newRequest.headers.set('Cookie', newRequestCookies)
@@ -284,3 +272,13 @@ function normalizeLocalizedTarget({
   }
   return targetUrl.toString()
 }
+
+async function cloneRequest(url, request: Request) {
+  // This is not ideal, but streaming to an external URL doesn't work
+  const body = request.body && !request.bodyUsed ? await request.arrayBuffer() : undefined
+  return new Request(url, {
+    headers: request.headers,
+    method: request.method,
+    body,
+  })
+}

package/package.json

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