@netlify/plugin-nextjs 5.13.2 → 5.13.4

package/dist/build/content/server.js

@@ -195,7 +195,13 @@ var copyNextDependencies = async (ctx) => {
       }
       const src = join(ctx.standaloneDir, entry);
       const dest = join(ctx.serverHandlerDir, entry);
-      await cp(src, dest, { recursive: true, verbatimSymlinks: true, force: true });
+      const filter = ctx.constants.IS_LOCAL ? void 0 : nodeModulesFilter;
+      await cp(src, dest, {
+        recursive: true,
+        verbatimSymlinks: true,
+        force: true,
+        filter
+      });
       if (entry === "node_modules") {
         await recreateNodeModuleSymlinks(ctx.resolveFromSiteDir("node_modules"), dest);
       }
@@ -295,6 +301,12 @@ var verifyHandlerDirStructure = async (ctx) => {
     );
   }
 };
+var nodeModulesFilter = async (sourcePath) => {
+  if (sourcePath.includes(".pnpm") && (sourcePath.includes("linuxmusl-x64") || sourcePath.includes("linux-x64-musl"))) {
+    return false;
+  }
+  return true;
+};
 export {
   copyNextDependencies,
   copyNextServerCode,

package/dist/build/functions/edge.js

@@ -405,7 +405,7 @@ var require_dist = __commonJS({
 // src/build/functions/edge.ts
 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 { cp, mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { dirname, join, relative } from "node:path/posix";
 import { EDGE_HANDLER_NAME } from "../plugin-context.js";
 function nodeMiddlewareDefinitionHasMatcher(definition) {
@@ -574,12 +574,23 @@ Check https://docs.netlify.com/build/frameworks/framework-setup-guides/nextjs/ov
   }
   const commonPrefix = relative(join(srcDir, maxParentDirectoriesPath), srcDir);
   parts.push(`const virtualModules = new Map();`);
+  const handleFileOrDirectory = async (fileOrDir) => {
+    const srcPath = join(srcDir, fileOrDir);
+    const stats = await stat(srcPath);
+    if (stats.isDirectory()) {
+      const filesInDir = await readdir(srcPath);
+      for (const fileInDir of filesInDir) {
+        await handleFileOrDirectory(join(fileOrDir, fileInDir));
+      }
+    } else {
+      const content = await readFile(srcPath, "utf8");
+      parts.push(
+        `virtualModules.set(${JSON.stringify(join(commonPrefix, fileOrDir))}, ${JSON.stringify(content)});`
+      );
+    }
+  };
   for (const file of files) {
-    const srcPath = join(srcDir, file);
-    const content = await readFile(srcPath, "utf8");
-    parts.push(
-      `virtualModules.set(${JSON.stringify(join(commonPrefix, file))}, ${JSON.stringify(content)});`
-    );
+    await handleFileOrDirectory(file);
   }
   parts.push(`registerCJSModules(import.meta.url, virtualModules);
 
@@ -599,16 +610,11 @@ var createEdgeHandler = async (ctx, definition) => {
 };
 var getHandlerName = ({ name }) => `${EDGE_HANDLER_NAME}-${name.replace(/\W/g, "-")}`;
 var buildHandlerDefinition = (ctx, def) => {
-  const functionHandlerName = getHandlerName({ name: def.name });
-  const functionName = "Next.js Middleware Handler";
-  const cache = def.name.endsWith("middleware") ? void 0 : "manual";
-  const generator = `${ctx.pluginName}@${ctx.pluginVersion}`;
   return augmentMatchers(def.matchers, ctx).map((matcher) => ({
-    function: functionHandlerName,
-    name: functionName,
+    function: getHandlerName({ name: def.name }),
+    name: "Next.js Middleware Handler",
     pattern: matcher.regexp,
-    cache,
-    generator
+    generator: `${ctx.pluginName}@${ctx.pluginVersion}`
   }));
 };
 var clearStaleEdgeHandlers = async (ctx) => {

package/dist/build/plugin-context.js

@@ -25,12 +25,12 @@ var DEFAULT_PUBLISH_DIR = ".next";
 var SERVER_HANDLER_NAME = "___netlify-server-handler";
 var EDGE_HANDLER_NAME = "___netlify-edge-handler";
 var PluginContext = class {
+  constants;
   featureFlags;
   netlifyConfig;
   pluginName;
   pluginVersion;
   utils;
-  constants;
   packageJSON;
   /** Absolute path of the next runtime plugin directory */
   pluginDir = PLUGIN_DIR;

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

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

package/dist/run/next.cjs

@@ -53,53 +53,48 @@ var require_patchFs = __commonJS({
     });
     exports2["default"] = patchFs2;
     var _lists = require_lists();
-    function _createForOfIteratorHelper(o, allowArrayLike) {
-      var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-      if (!it) {
-        if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-          if (it) o = it;
-          var i = 0;
-          var F = function F2() {
+    function _createForOfIteratorHelper(r, e) {
+      var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+      if (!t) {
+        if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) {
+          t && (r = t);
+          var _n = 0, F = function F2() {
           };
           return { s: F, n: function n() {
-            if (i >= o.length) return { done: true };
-            return { done: false, value: o[i++] };
-          }, e: function e(_e) {
-            throw _e;
+            return _n >= r.length ? { done: true } : { done: false, value: r[_n++] };
+          }, e: function e2(r2) {
+            throw r2;
           }, f: F };
         }
         throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
       }
-      var normalCompletion = true, didErr = false, err;
+      var o, a = true, u = false;
       return { s: function s() {
-        it = it.call(o);
+        t = t.call(r);
       }, n: function n() {
-        var step = it.next();
-        normalCompletion = step.done;
-        return step;
-      }, e: function e(_e2) {
-        didErr = true;
-        err = _e2;
+        var r2 = t.next();
+        return a = r2.done, r2;
+      }, e: function e2(r2) {
+        u = true, o = r2;
       }, f: function f() {
         try {
-          if (!normalCompletion && it["return"] != null) it["return"]();
+          a || null == t["return"] || t["return"]();
         } finally {
-          if (didErr) throw err;
+          if (u) throw o;
         }
       } };
     }
-    function _unsupportedIterableToArray(o, minLen) {
-      if (!o) return;
-      if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-      var n = Object.prototype.toString.call(o).slice(8, -1);
-      if (n === "Object" && o.constructor) n = o.constructor.name;
-      if (n === "Map" || n === "Set") return Array.from(o);
-      if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+    function _unsupportedIterableToArray(r, a) {
+      if (r) {
+        if ("string" == typeof r) return _arrayLikeToArray(r, a);
+        var t = {}.toString.call(r).slice(8, -1);
+        return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+      }
     }
-    function _arrayLikeToArray(arr, len) {
-      if (len == null || len > arr.length) len = arr.length;
-      for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-      return arr2;
+    function _arrayLikeToArray(r, a) {
+      (null == a || a > r.length) && (a = r.length);
+      for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+      return n;
     }
     function patchFs2(vol) {
       var fs2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : require("fs");
@@ -157,8 +152,25 @@ var require_patchFs = __commonJS({
       } finally {
         _iterator3.f();
       }
+      var promisesBackup;
+      try {
+        promisesBackup = fs2.promises;
+        Object.defineProperty(fs2, "promises", {
+          get: function get2() {
+            return vol.promises;
+          }
+        });
+      } catch (_unused) {
+      }
       return function unpatch() {
         for (var key in bkp) fs2[key] = bkp[key];
+        if (promisesBackup) {
+          Object.defineProperty(fs2, "promises", {
+            get: function get2() {
+              return promisesBackup;
+            }
+          });
+        }
       };
     }
   }
@@ -229,24 +241,19 @@ var require_patchRequire = __commonJS({
     });
     exports2["default"] = patchRequire;
     var path = _interopRequireWildcard(require("path"));
-    function _getRequireWildcardCache(e) {
-      if ("function" != typeof WeakMap) return null;
-      var r = /* @__PURE__ */ new WeakMap(), t = /* @__PURE__ */ new WeakMap();
-      return (_getRequireWildcardCache = function _getRequireWildcardCache2(e2) {
-        return e2 ? t : r;
-      })(e);
-    }
-    function _interopRequireWildcard(e, r) {
-      if (!r && e && e.__esModule) return e;
-      if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e };
-      var t = _getRequireWildcardCache(r);
-      if (t && t.has(e)) return t.get(e);
-      var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-      for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-        var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-        i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];
-      }
-      return n["default"] = e, t && t.set(e, n), n;
+    function _interopRequireWildcard(e, t) {
+      if ("function" == typeof WeakMap) var r = /* @__PURE__ */ new WeakMap(), n = /* @__PURE__ */ new WeakMap();
+      return (_interopRequireWildcard = function _interopRequireWildcard2(e2, t2) {
+        if (!t2 && e2 && e2.__esModule) return e2;
+        var o, i, f = { __proto__: null, "default": e2 };
+        if (null === e2 || "object" != _typeof(e2) && "function" != typeof e2) return f;
+        if (o = t2 ? n : r) {
+          if (o.has(e2)) return o.get(e2);
+          o.set(e2, f);
+        }
+        for (var _t in e2) "default" !== _t && {}.hasOwnProperty.call(e2, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e2, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e2[_t]);
+        return f;
+      })(e, t);
     }
     var isWin32 = process.platform === "win32";
     var correctPath = isWin32 ? require_correctPath().correctPath : function(p) {
@@ -457,27 +464,22 @@ var require_lib = __commonJS({
     var _correctPath = require_correctPath();
     var util = _interopRequireWildcard(require_lists());
     exports2.util = util;
-    function _getRequireWildcardCache(e) {
-      if ("function" != typeof WeakMap) return null;
-      var r = /* @__PURE__ */ new WeakMap(), t = /* @__PURE__ */ new WeakMap();
-      return (_getRequireWildcardCache = function _getRequireWildcardCache2(e2) {
-        return e2 ? t : r;
-      })(e);
-    }
-    function _interopRequireWildcard(e, r) {
-      if (!r && e && e.__esModule) return e;
-      if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e };
-      var t = _getRequireWildcardCache(r);
-      if (t && t.has(e)) return t.get(e);
-      var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-      for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-        var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-        i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];
-      }
-      return n["default"] = e, t && t.set(e, n), n;
+    function _interopRequireWildcard(e, t) {
+      if ("function" == typeof WeakMap) var r = /* @__PURE__ */ new WeakMap(), n = /* @__PURE__ */ new WeakMap();
+      return (_interopRequireWildcard = function _interopRequireWildcard2(e2, t2) {
+        if (!t2 && e2 && e2.__esModule) return e2;
+        var o, i, f = { __proto__: null, "default": e2 };
+        if (null === e2 || "object" != _typeof(e2) && "function" != typeof e2) return f;
+        if (o = t2 ? n : r) {
+          if (o.has(e2)) return o.get(e2);
+          o.set(e2, f);
+        }
+        for (var _t in e2) "default" !== _t && {}.hasOwnProperty.call(e2, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e2, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e2[_t]);
+        return f;
+      })(e, t);
     }
-    function _interopRequireDefault(obj) {
-      return obj && obj.__esModule ? obj : { "default": obj };
+    function _interopRequireDefault(e) {
+      return e && e.__esModule ? e : { "default": e };
     }
   }
 });

package/edge-runtime/lib/response.ts

@@ -210,7 +210,7 @@ export const buildResponse = async ({
       logger.withFields({ redirect_url: redirect }).debug('Redirect url is same as original url')
       return
     }
-    edgeResponse.headers.set('location', redirect)
+    edgeResponse.headers.set('location', relativizeURL(redirect, request.url))
   }
 
   // Data requests shouldn't automatically redirect in the browser (they might be HTML pages): they're handled by the router

package/package.json

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