@netlify/plugin-nextjs 5.2.0 → 5.2.2

package/dist/run/headers.js

@@ -58,7 +58,7 @@ var mapHeaderValues = (header, callback) => {
 };
 var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   const netlifyVaryValues = {
-    header: ["x-nextjs-data"],
+    header: ["x-nextjs-data", "x-next-debug-logging"],
     language: [],
     cookie: ["__prerender_bypass", "__next_preview_data"],
     query: [],

package/dist/run/next.cjs

@@ -38,12 +38,9 @@ var require_lists = __commonJS({
       value: true
     });
     exports2.fsSyncMethods = exports2.fsProps = exports2.fsAsyncMethods = void 0;
-    var fsProps = ["constants", "F_OK", "R_OK", "W_OK", "X_OK", "Stats"];
-    exports2.fsProps = fsProps;
-    var fsSyncMethods = ["renameSync", "ftruncateSync", "truncateSync", "chownSync", "fchownSync", "lchownSync", "chmodSync", "fchmodSync", "lchmodSync", "statSync", "lstatSync", "fstatSync", "linkSync", "symlinkSync", "readlinkSync", "realpathSync", "unlinkSync", "rmdirSync", "mkdirSync", "mkdirpSync", "readdirSync", "closeSync", "openSync", "utimesSync", "futimesSync", "fsyncSync", "writeSync", "readSync", "readFileSync", "writeFileSync", "appendFileSync", "existsSync", "accessSync", "fdatasyncSync", "mkdtempSync", "copyFileSync", "rmSync", "createReadStream", "createWriteStream"];
-    exports2.fsSyncMethods = fsSyncMethods;
-    var fsAsyncMethods = ["rename", "ftruncate", "truncate", "chown", "fchown", "lchown", "chmod", "fchmod", "lchmod", "stat", "lstat", "fstat", "link", "symlink", "readlink", "realpath", "unlink", "rmdir", "mkdir", "mkdirp", "readdir", "close", "open", "utimes", "futimes", "fsync", "write", "read", "readFile", "writeFile", "appendFile", "exists", "access", "fdatasync", "mkdtemp", "copyFile", "rm", "watchFile", "unwatchFile", "watch"];
-    exports2.fsAsyncMethods = fsAsyncMethods;
+    var fsProps = exports2.fsProps = ["constants", "F_OK", "R_OK", "W_OK", "X_OK", "Stats"];
+    var fsSyncMethods = exports2.fsSyncMethods = ["renameSync", "ftruncateSync", "truncateSync", "chownSync", "fchownSync", "lchownSync", "chmodSync", "fchmodSync", "lchmodSync", "statSync", "lstatSync", "fstatSync", "linkSync", "symlinkSync", "readlinkSync", "realpathSync", "unlinkSync", "rmdirSync", "mkdirSync", "mkdirpSync", "readdirSync", "closeSync", "openSync", "utimesSync", "futimesSync", "fsyncSync", "writeSync", "readSync", "readFileSync", "writeFileSync", "appendFileSync", "existsSync", "accessSync", "fdatasyncSync", "mkdtempSync", "copyFileSync", "rmSync", "createReadStream", "createWriteStream"];
+    var fsAsyncMethods = exports2.fsAsyncMethods = ["rename", "ftruncate", "truncate", "chown", "fchown", "lchown", "chmod", "fchmod", "lchmod", "stat", "lstat", "fstat", "link", "symlink", "readlink", "realpath", "unlink", "rmdir", "mkdir", "mkdirp", "readdir", "close", "open", "utimes", "futimes", "fsync", "write", "read", "readFile", "writeFile", "appendFile", "exists", "access", "fdatasync", "mkdtemp", "copyFile", "rm", "watchFile", "unwatchFile", "watch"];
   }
 });
 
@@ -235,56 +232,42 @@ var require_correctPath = __commonJS({
 var require_patchRequire = __commonJS({
   "node_modules/fs-monkey/lib/patchRequire.js"(exports2) {
     "use strict";
-    function _typeof(obj) {
+    function _typeof(o) {
       "@babel/helpers - typeof";
-      return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
-        return typeof obj2;
-      } : function(obj2) {
-        return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
-      }, _typeof(obj);
+      return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o2) {
+        return typeof o2;
+      } : function(o2) {
+        return o2 && "function" == typeof Symbol && o2.constructor === Symbol && o2 !== Symbol.prototype ? "symbol" : typeof o2;
+      }, _typeof(o);
     }
     Object.defineProperty(exports2, "__esModule", {
       value: true
     });
     exports2["default"] = patchRequire;
     var path = _interopRequireWildcard(require("path"));
-    function _getRequireWildcardCache(nodeInterop) {
-      if (typeof WeakMap !== "function")
+    function _getRequireWildcardCache(e) {
+      if ("function" != typeof WeakMap)
         return null;
-      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-      return (_getRequireWildcardCache = function _getRequireWildcardCache2(nodeInterop2) {
-        return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-      })(nodeInterop);
+      var r = /* @__PURE__ */ new WeakMap(), t = /* @__PURE__ */ new WeakMap();
+      return (_getRequireWildcardCache = function _getRequireWildcardCache2(e2) {
+        return e2 ? t : r;
+      })(e);
     }
-    function _interopRequireWildcard(obj, nodeInterop) {
-      if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-      }
-      if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") {
-        return { "default": obj };
-      }
-      var cache = _getRequireWildcardCache(nodeInterop);
-      if (cache && cache.has(obj)) {
-        return cache.get(obj);
-      }
-      var newObj = {};
-      var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-      for (var key in obj) {
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-          var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-          if (desc && (desc.get || desc.set)) {
-            Object.defineProperty(newObj, key, desc);
-          } else {
-            newObj[key] = obj[key];
-          }
+    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];
         }
-      }
-      newObj["default"] = obj;
-      if (cache) {
-        cache.set(obj, newObj);
-      }
-      return newObj;
+      return n["default"] = e, t && t.set(e, n), n;
     }
     var isWin32 = process.platform === "win32";
     var correctPath = isWin32 ? require_correctPath().correctPath : function(p) {
@@ -470,13 +453,13 @@ var require_patchRequire = __commonJS({
 var require_lib = __commonJS({
   "node_modules/fs-monkey/lib/index.js"(exports2) {
     "use strict";
-    function _typeof(obj) {
+    function _typeof(o) {
       "@babel/helpers - typeof";
-      return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
-        return typeof obj2;
-      } : function(obj2) {
-        return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
-      }, _typeof(obj);
+      return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o2) {
+        return typeof o2;
+      } : function(o2) {
+        return o2 && "function" == typeof Symbol && o2.constructor === Symbol && o2 !== Symbol.prototype ? "symbol" : typeof o2;
+      }, _typeof(o);
     }
     Object.defineProperty(exports2, "__esModule", {
       value: true
@@ -505,43 +488,29 @@ var require_lib = __commonJS({
     var _correctPath = require_correctPath();
     var util = _interopRequireWildcard(require_lists());
     exports2.util = util;
-    function _getRequireWildcardCache(nodeInterop) {
-      if (typeof WeakMap !== "function")
+    function _getRequireWildcardCache(e) {
+      if ("function" != typeof WeakMap)
         return null;
-      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-      return (_getRequireWildcardCache = function _getRequireWildcardCache2(nodeInterop2) {
-        return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-      })(nodeInterop);
+      var r = /* @__PURE__ */ new WeakMap(), t = /* @__PURE__ */ new WeakMap();
+      return (_getRequireWildcardCache = function _getRequireWildcardCache2(e2) {
+        return e2 ? t : r;
+      })(e);
     }
-    function _interopRequireWildcard(obj, nodeInterop) {
-      if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-      }
-      if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") {
-        return { "default": obj };
-      }
-      var cache = _getRequireWildcardCache(nodeInterop);
-      if (cache && cache.has(obj)) {
-        return cache.get(obj);
-      }
-      var newObj = {};
-      var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-      for (var key in obj) {
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-          var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-          if (desc && (desc.get || desc.set)) {
-            Object.defineProperty(newObj, key, desc);
-          } else {
-            newObj[key] = obj[key];
-          }
+    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];
         }
-      }
-      newObj["default"] = obj;
-      if (cache) {
-        cache.set(obj, newObj);
-      }
-      return newObj;
+      return n["default"] = e, t && t.set(e, n), n;
     }
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { "default": obj };

package/dist/run/systemlog.js

@@ -4,104 +4,75 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  __commonJS,
-  __require,
-  __toESM
-} from "../esm-chunks/chunk-5JVNISGM.js";
+import "../esm-chunks/chunk-5JVNISGM.js";
 
-// node_modules/@netlify/functions/dist/lib/system_logger.js
-var require_system_logger = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/system_logger.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.systemLogger = exports.LogLevel = void 0;
-    var process_1 = __require("process");
-    var systemLogTag = "__nfSystemLog";
-    var serializeError = (error) => {
-      const cause = error?.cause instanceof Error ? serializeError(error.cause) : error.cause;
-      return {
-        error: error.message,
-        error_cause: cause,
-        error_stack: error.stack
-      };
-    };
-    var LogLevel2;
-    (function(LogLevel3) {
-      LogLevel3[LogLevel3["Debug"] = 1] = "Debug";
-      LogLevel3[LogLevel3["Log"] = 2] = "Log";
-      LogLevel3[LogLevel3["Error"] = 3] = "Error";
-    })(LogLevel2 = exports.LogLevel || (exports.LogLevel = {}));
-    var SystemLogger = class _SystemLogger {
-      fields;
-      logLevel;
-      constructor(fields = {}, logLevel = LogLevel2.Log) {
-        this.fields = fields;
-        this.logLevel = logLevel;
-      }
-      doLog(logger, message) {
-        if (process_1.env.NETLIFY_DEV && !process_1.env.NETLIFY_ENABLE_SYSTEM_LOGGING) {
-          return;
-        }
-        logger(systemLogTag, JSON.stringify({ msg: message, fields: this.fields }));
-      }
-      log(message) {
-        if (this.logLevel > LogLevel2.Log) {
-          return;
-        }
-        this.doLog(console.log, message);
-      }
-      debug(message) {
-        if (this.logLevel > LogLevel2.Debug) {
-          return;
-        }
-        this.doLog(console.debug, message);
-      }
-      error(message) {
-        if (this.logLevel > LogLevel2.Error) {
-          return;
-        }
-        this.doLog(console.error, message);
-      }
-      withLogLevel(level) {
-        return new _SystemLogger(this.fields, level);
-      }
-      withFields(fields) {
-        return new _SystemLogger({
-          ...this.fields,
-          ...fields
-        }, this.logLevel);
-      }
-      withError(error) {
-        const fields = error instanceof Error ? serializeError(error) : { error };
-        return this.withFields(fields);
-      }
-    };
-    exports.systemLogger = new SystemLogger();
+// node_modules/@netlify/functions/dist/chunk-HYMERDCV.mjs
+import { env } from "process";
+var systemLogTag = "__nfSystemLog";
+var serializeError = (error) => {
+  const cause = error?.cause instanceof Error ? serializeError(error.cause) : error.cause;
+  return {
+    error: error.message,
+    error_cause: cause,
+    error_stack: error.stack
+  };
+};
+var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
+  LogLevel2[LogLevel2["Debug"] = 1] = "Debug";
+  LogLevel2[LogLevel2["Log"] = 2] = "Log";
+  LogLevel2[LogLevel2["Error"] = 3] = "Error";
+  return LogLevel2;
+})(LogLevel || {});
+var SystemLogger = class _SystemLogger {
+  fields;
+  logLevel;
+  constructor(fields = {}, logLevel = 2) {
+    this.fields = fields;
+    this.logLevel = logLevel;
   }
-});
-
-// node_modules/@netlify/functions/dist/internal.js
-var require_internal = __commonJS({
-  "node_modules/@netlify/functions/dist/internal.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.LogLevel = exports.systemLogger = void 0;
-    var system_logger_js_1 = require_system_logger();
-    Object.defineProperty(exports, "systemLogger", { enumerable: true, get: function() {
-      return system_logger_js_1.systemLogger;
-    } });
-    Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function() {
-      return system_logger_js_1.LogLevel;
-    } });
+  doLog(logger, message) {
+    if (env.NETLIFY_DEV && !env.NETLIFY_ENABLE_SYSTEM_LOGGING) {
+      return;
+    }
+    logger(systemLogTag, JSON.stringify({ msg: message, fields: this.fields }));
   }
-});
-
-// src/run/systemlog.ts
-var import_internal = __toESM(require_internal(), 1);
-var export_LogLevel = import_internal.LogLevel;
-var export_logger = import_internal.systemLogger;
+  log(message) {
+    if (this.logLevel > 2) {
+      return;
+    }
+    this.doLog(console.log, message);
+  }
+  debug(message) {
+    if (this.logLevel > 1) {
+      return;
+    }
+    this.doLog(console.debug, message);
+  }
+  error(message) {
+    if (this.logLevel > 3) {
+      return;
+    }
+    this.doLog(console.error, message);
+  }
+  withLogLevel(level) {
+    return new _SystemLogger(this.fields, level);
+  }
+  withFields(fields) {
+    return new _SystemLogger(
+      {
+        ...this.fields,
+        ...fields
+      },
+      this.logLevel
+    );
+  }
+  withError(error) {
+    const fields = error instanceof Error ? serializeError(error) : { error };
+    return this.withFields(fields);
+  }
+};
+var systemLogger = new SystemLogger();
 export {
-  export_LogLevel as LogLevel,
-  export_logger as logger
+  LogLevel,
+  systemLogger as logger
 };

package/edge-runtime/lib/response.ts

@@ -3,6 +3,8 @@ import { HTMLRewriter } from '../vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/
 
 import { updateModifiedHeaders } from './headers.ts'
 import type { StructuredLogger } from './logging.ts'
+import { addMiddlewareHeaders, isMiddlewareRequest, isMiddlewareResponse } from './middleware.ts'
+import { RequestData } from './next-request.ts'
 import {
   addBasePath,
   normalizeDataUrl,
@@ -10,8 +12,6 @@ import {
   normalizeTrailingSlash,
   relativizeURL,
 } from './util.ts'
-import { addMiddlewareHeaders, isMiddlewareRequest, isMiddlewareResponse } from './middleware.ts'
-import { RequestData } from './next-request.ts'
 
 export interface FetchEventResult {
   response: Response
@@ -118,11 +118,12 @@ export const buildResponse = async ({
 
   let rewrite = res.headers.get('x-middleware-rewrite')
   let redirect = res.headers.get('location')
+  let nextRedirect = res.headers.get('x-nextjs-redirect')
 
   // Data requests (i.e. requests for /_next/data ) need special handling
   const isDataReq = request.headers.has('x-nextjs-data')
   // Data requests need to be normalized to the route path
-  if (isDataReq && !redirect && !rewrite) {
+  if (isDataReq && !redirect && !rewrite && !nextRedirect) {
     const requestUrl = new URL(request.url)
     const normalizedDataUrl = normalizeDataUrl(requestUrl.pathname)
     // Don't rewrite unless the URL has changed
@@ -181,8 +182,11 @@ export const buildResponse = async ({
       // The rewrite target is a data request, but a middleware rewrite target is always for the page route,
       // so we need to tell the server this is a data request. Setting the `x-nextjs-data` header is not enough. 🤷
       rewriteUrl.searchParams.set('__nextDataReq', '1')
-      rewriteUrl.pathname = normalizeTrailingSlash(rewriteUrl.pathname, nextConfig?.trailingSlash)
     }
+
+    // respect trailing slash rules to prevent 308s
+    rewriteUrl.pathname = normalizeTrailingSlash(rewriteUrl.pathname, nextConfig?.trailingSlash)
+
     const target = normalizeLocalizedTarget({ target: rewriteUrl.toString(), request, nextConfig })
     if (target === request.url) {
       logger.withFields({ rewrite_url: rewrite }).debug('Rewrite url is same as original url')
@@ -209,7 +213,7 @@ export const buildResponse = async ({
     res.headers.set('x-nextjs-redirect', relativizeURL(redirect, request.url))
   }
 
-  const nextRedirect = res.headers.get('x-nextjs-redirect')
+  nextRedirect = res.headers.get('x-nextjs-redirect')
 
   if (nextRedirect && isDataReq) {
     res.headers.set('x-nextjs-redirect', normalizeDataUrl(nextRedirect))

package/package.json

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