@netlify/plugin-nextjs 5.2.1 → 5.3.0

package/dist/run/headers.js

@@ -4,7 +4,7 @@
         return createRequire(import.meta.url);
       })();
     
-import "../esm-chunks/chunk-5JVNISGM.js";
+import "../esm-chunks/chunk-OEQOKJGE.js";
 
 // src/run/headers.ts
 import { encodeBlobKey } from "../shared/blobkey.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

@@ -57,14 +57,12 @@ var require_patchFs = __commonJS({
       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;
+          if (it) o = it;
           var i = 0;
           var F = function F2() {
           };
           return { s: F, n: function n() {
-            if (i >= o.length)
-              return { done: true };
+            if (i >= o.length) return { done: true };
             return { done: false, value: o[i++] };
           }, e: function e(_e) {
             throw _e;
@@ -84,32 +82,23 @@ var require_patchFs = __commonJS({
         err = _e2;
       }, f: function f() {
         try {
-          if (!normalCompletion && it["return"] != null)
-            it["return"]();
+          if (!normalCompletion && it["return"] != null) it["return"]();
         } finally {
-          if (didErr)
-            throw err;
+          if (didErr) throw err;
         }
       } };
     }
     function _unsupportedIterableToArray(o, minLen) {
-      if (!o)
-        return;
-      if (typeof o === "string")
-        return _arrayLikeToArray(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);
+      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 _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];
+      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 patchFs2(vol) {
@@ -126,8 +115,7 @@ var require_patchFs = __commonJS({
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done; ) {
           var prop = _step.value;
-          if (typeof vol[prop] !== "undefined")
-            patch(prop, vol[prop]);
+          if (typeof vol[prop] !== "undefined") patch(prop, vol[prop]);
         }
       } catch (err) {
         _iterator.e(err);
@@ -146,14 +134,12 @@ var require_patchFs = __commonJS({
       if (typeof vol.WriteStream === "function") {
         patch("WriteStream", vol.WriteStream.bind(null, vol));
       }
-      if (typeof vol._toUnixTimestamp === "function")
-        patchMethod("_toUnixTimestamp");
+      if (typeof vol._toUnixTimestamp === "function") patchMethod("_toUnixTimestamp");
       var _iterator2 = _createForOfIteratorHelper(_lists.fsAsyncMethods), _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done; ) {
           var method = _step2.value;
-          if (typeof vol[method] === "function")
-            patchMethod(method);
+          if (typeof vol[method] === "function") patchMethod(method);
         }
       } catch (err) {
         _iterator2.e(err);
@@ -164,8 +150,7 @@ var require_patchFs = __commonJS({
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done; ) {
           var _method = _step3.value;
-          if (typeof vol[_method] === "function")
-            patchMethod(_method);
+          if (typeof vol[_method] === "function") patchMethod(_method);
         }
       } catch (err) {
         _iterator3.e(err);
@@ -173,8 +158,7 @@ var require_patchFs = __commonJS({
         _iterator3.f();
       }
       return function unpatch() {
-        for (var key in bkp)
-          fs2[key] = bkp[key];
+        for (var key in bkp) fs2[key] = bkp[key];
       };
     }
   }
@@ -246,27 +230,22 @@ var require_patchRequire = __commonJS({
     exports2["default"] = patchRequire;
     var path = _interopRequireWildcard(require("path"));
     function _getRequireWildcardCache(e) {
-      if ("function" != typeof WeakMap)
-        return null;
+      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 };
+      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);
+      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];
-        }
+      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;
     }
     var isWin32 = process.platform === "win32";
@@ -314,12 +293,10 @@ var require_patchRequire = __commonJS({
         var cache = stat.cache;
         if (cache !== null) {
           var _result = cache.get(filename);
-          if (_result !== void 0)
-            return _result;
+          if (_result !== void 0) return _result;
         }
         var result = internalModuleStat(filename);
-        if (cache !== null)
-          cache.set(filename, result);
+        if (cache !== null) cache.set(filename, result);
         return result;
       }
       stat.cache = null;
@@ -330,8 +307,7 @@ var require_patchRequire = __commonJS({
       var packageMainCache = /* @__PURE__ */ Object.create(null);
       function readPackage(requestPath) {
         var entry = packageMainCache[requestPath];
-        if (entry)
-          return entry;
+        if (entry) return entry;
         var jsonPath = path.resolve(requestPath, "package.json");
         var json = internalModuleReadFile(path._makeLong(jsonPath));
         if (json === void 0) {
@@ -366,8 +342,7 @@ var require_patchRequire = __commonJS({
       }
       function tryPackage(requestPath, exts, isMain) {
         var pkg = readPackage(requestPath);
-        if (!pkg)
-          return false;
+        if (!pkg) return false;
         var filename = path.resolve(requestPath, pkg);
         return tryFile(filename, isMain) || tryExtensions(filename, exts, isMain) || tryExtensions(path.resolve(filename, "index"), exts, isMain);
       }
@@ -393,14 +368,12 @@ var require_patchRequire = __commonJS({
         }
         var cacheKey = request + "\0" + (paths.length === 1 ? paths[0] : paths.join("\0"));
         var entry = Module._pathCache[cacheKey];
-        if (entry)
-          return entry;
+        if (entry) return entry;
         var exts;
         var trailingSlash = request.length > 0 && request.charCodeAt(request.length - 1) === 47;
         for (var i = 0; i < paths.length; i++) {
           var curPath = paths[i];
-          if (curPath && stat(curPath) < 1)
-            continue;
+          if (curPath && stat(curPath) < 1) continue;
           var basePath = correctPath(path.resolve(curPath, request));
           var filename;
           var rc = stat(basePath);
@@ -412,24 +385,20 @@ var require_patchRequire = __commonJS({
                 filename = toRealPath(basePath);
               }
             } else if (rc === 1) {
-              if (exts === void 0)
-                exts = Object.keys(Module._extensions);
+              if (exts === void 0) exts = Object.keys(Module._extensions);
               filename = tryPackage(basePath, exts, isMain);
             }
             if (!filename) {
-              if (exts === void 0)
-                exts = Object.keys(Module._extensions);
+              if (exts === void 0) exts = Object.keys(Module._extensions);
               filename = tryExtensions(basePath, exts, isMain);
             }
           }
           if (!filename && rc === 1) {
-            if (exts === void 0)
-              exts = Object.keys(Module._extensions);
+            if (exts === void 0) exts = Object.keys(Module._extensions);
             filename = tryPackage(basePath, exts, isMain);
           }
           if (!filename && rc === 1) {
-            if (exts === void 0)
-              exts = Object.keys(Module._extensions);
+            if (exts === void 0) exts = Object.keys(Module._extensions);
             filename = tryExtensions(path.resolve(basePath, "index"), exts, isMain);
           }
           if (filename) {
@@ -489,27 +458,22 @@ var require_lib = __commonJS({
     var util = _interopRequireWildcard(require_lists());
     exports2.util = util;
     function _getRequireWildcardCache(e) {
-      if ("function" != typeof WeakMap)
-        return null;
+      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 };
+      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);
+      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];
-        }
+      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 _interopRequireDefault(obj) {

package/dist/run/revalidate.js

@@ -4,7 +4,7 @@
         return createRequire(import.meta.url);
       })();
     
-import "../esm-chunks/chunk-5JVNISGM.js";
+import "../esm-chunks/chunk-OEQOKJGE.js";
 
 // src/run/revalidate.ts
 var nextResponseProxy = (res, requestContext) => {

package/dist/run/systemlog.cjs

@@ -0,0 +1,98 @@
+"use strict";
+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))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/run/systemlog.cts
+var systemlog_exports = {};
+__export(systemlog_exports, {
+  LogLevel: () => LogLevel,
+  logger: () => systemLogger
+});
+module.exports = __toCommonJS(systemlog_exports);
+
+// node_modules/@netlify/functions/dist/chunk-HYMERDCV.mjs
+var import_process = 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 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;
+  }
+  doLog(logger, message) {
+    if (import_process.env.NETLIFY_DEV && !import_process.env.NETLIFY_ENABLE_SYSTEM_LOGGING) {
+      return;
+    }
+    logger(systemLogTag, JSON.stringify({ msg: message, fields: this.fields }));
+  }
+  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();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  LogLevel,
+  logger
+});

package/dist/shared/blobkey.js

@@ -4,7 +4,7 @@
         return createRequire(import.meta.url);
       })();
     
-import "../esm-chunks/chunk-5JVNISGM.js";
+import "../esm-chunks/chunk-OEQOKJGE.js";
 
 // src/shared/blobkey.ts
 import { Buffer } from "node:buffer";

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
@@ -182,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')

package/package.json

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

package/dist/run/systemlog.js

@@ -1,107 +0,0 @@
-
-      var require = await (async () => {
-        var { createRequire } = await import("node:module");
-        return createRequire(import.meta.url);
-      })();
-    
-import {
-  __commonJS,
-  __require,
-  __toESM
-} from "../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/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;
-    } });
-  }
-});
-
-// src/run/systemlog.ts
-var import_internal = __toESM(require_internal(), 1);
-var export_LogLevel = import_internal.LogLevel;
-var export_logger = import_internal.systemLogger;
-export {
-  export_LogLevel as LogLevel,
-  export_logger as logger
-};