@netlify/plugin-nextjs 5.2.1 → 5.2.2

package/dist/build/templates/handler-monorepo.tmpl.js

@@ -16,9 +16,7 @@ export default async function (req, context) {
     tracing.start()
   }
 
-  const requestContext = createRequestContext(
-    req.headers.get('x-nf-debug-logging') || req.headers.get('x-next-debug-logging'),
-  )
+  const requestContext = createRequestContext(req.headers.get('x-next-debug-logging'))
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {

package/dist/build/templates/handler.tmpl.js

@@ -13,9 +13,7 @@ export default async function handler(req, context) {
   if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL) {
     tracing.start()
   }
-  const requestContext = createRequestContext(
-    req.headers.get('x-nf-debug-logging') || req.headers.get('x-next-debug-logging'),
-  )
+  const requestContext = createRequestContext(req.headers.get('x-next-debug-logging'))
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {

package/dist/esm-chunks/{package-SCUAWNXR.js → package-YOCAX5OR.js}

@@ -8,7 +8,7 @@ import "./chunk-5JVNISGM.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.2.1";
+var version = "5.2.2";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -60,11 +60,11 @@ var devDependencies = {
   "@netlify/blobs": "^7.3.0",
   "@netlify/build": "^29.41.2",
   "@netlify/edge-bundler": "^12.0.0",
-  "@netlify/edge-functions": "^2.6.0",
+  "@netlify/edge-functions": "^2.6.1",
   "@netlify/eslint-config-node": "^7.0.1",
-  "@netlify/functions": "^2.5.1",
-  "@netlify/serverless-functions-api": "^1.18.0",
-  "@netlify/zip-it-and-ship-it": "^9.32.1",
+  "@netlify/functions": "^2.6.3",
+  "@netlify/serverless-functions-api": "^1.18.1",
+  "@netlify/zip-it-and-ship-it": "^9.32.2",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
   "@opentelemetry/resources": "^1.24.0",

package/dist/run/handlers/cache.cjs

@@ -5,9 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -30,230 +27,71 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// node_modules/is-promise/index.js
-var require_is_promise = __commonJS({
-  "node_modules/is-promise/index.js"(exports2, module2) {
-    module2.exports = isPromise;
-    module2.exports.default = isPromise;
-    function isPromise(obj) {
-      return !!obj && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
-    }
-  }
-});
-
-// node_modules/@netlify/functions/dist/lib/consts.js
-var require_consts = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/consts.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.METADATA_VERSION = exports2.HTTP_STATUS_OK = exports2.HTTP_STATUS_METHOD_NOT_ALLOWED = exports2.BUILDER_FUNCTIONS_FLAG = void 0;
-    var BUILDER_FUNCTIONS_FLAG = true;
-    exports2.BUILDER_FUNCTIONS_FLAG = BUILDER_FUNCTIONS_FLAG;
-    var HTTP_STATUS_METHOD_NOT_ALLOWED = 405;
-    exports2.HTTP_STATUS_METHOD_NOT_ALLOWED = HTTP_STATUS_METHOD_NOT_ALLOWED;
-    var HTTP_STATUS_OK = 200;
-    exports2.HTTP_STATUS_OK = HTTP_STATUS_OK;
-    var METADATA_VERSION = 1;
-    exports2.METADATA_VERSION = METADATA_VERSION;
-  }
+// src/run/handlers/cache.cts
+var cache_exports = {};
+__export(cache_exports, {
+  NetlifyCacheHandler: () => NetlifyCacheHandler,
+  default: () => cache_default
 });
+module.exports = __toCommonJS(cache_exports);
+var import_node_buffer = require("node:buffer");
 
-// node_modules/@netlify/functions/dist/lib/builder.js
-var require_builder = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/builder.js"(exports2) {
-    "use strict";
-    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.builder = void 0;
-    var is_promise_1 = __importDefault(require_is_promise());
-    var consts_js_1 = require_consts();
-    var augmentResponse = (response) => {
-      if (!response) {
-        return response;
-      }
-      const metadata = { version: consts_js_1.METADATA_VERSION, builder_function: consts_js_1.BUILDER_FUNCTIONS_FLAG, ttl: response.ttl || 0 };
-      return {
-        ...response,
-        metadata
-      };
-    };
-    var wrapHandler = (handler) => (
-      // eslint-disable-next-line promise/prefer-await-to-callbacks
-      (event, context, callback) => {
-        if (event.httpMethod !== "GET" && event.httpMethod !== "HEAD") {
-          return Promise.resolve({
-            body: "Method Not Allowed",
-            statusCode: consts_js_1.HTTP_STATUS_METHOD_NOT_ALLOWED
-          });
-        }
-        const modifiedEvent = {
-          ...event,
-          multiValueQueryStringParameters: {},
-          queryStringParameters: {}
-        };
-        const wrappedCallback = (error, response) => (
-          // eslint-disable-next-line promise/prefer-await-to-callbacks
-          callback ? callback(error, augmentResponse(response)) : null
-        );
-        const execution = handler(modifiedEvent, context, wrappedCallback);
-        if ((0, is_promise_1.default)(execution)) {
-          return execution.then(augmentResponse);
-        }
-        return execution;
-      }
+// node_modules/@netlify/functions/dist/chunk-COIAWFHF.mjs
+var import_process = require("process");
+var purgeCache = async (options = {}) => {
+  if (globalThis.fetch === void 0) {
+    throw new Error(
+      "`fetch` is not available. Please ensure you're using Node.js version 18.0.0 or above. Refer to https://ntl.fyi/functions-runtime for more information."
     );
-    exports2.builder = wrapHandler;
   }
-});
-
-// node_modules/@netlify/functions/dist/lib/purge_cache.js
-var require_purge_cache = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/purge_cache.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.purgeCache = void 0;
-    var process_1 = require("process");
-    var purgeCache2 = async (options = {}) => {
-      if (globalThis.fetch === void 0) {
-        throw new Error("`fetch` is not available. Please ensure you're using Node.js version 18.0.0 or above. Refer to https://ntl.fyi/functions-runtime for more information.");
-      }
-      const payload = {
-        cache_tags: options.tags,
-        deploy_alias: options.deployAlias
-      };
-      const token = process_1.env.NETLIFY_PURGE_API_TOKEN || options.token;
-      if ("siteSlug" in options) {
-        payload.site_slug = options.siteSlug;
-      } else if ("domain" in options) {
-        payload.domain = options.domain;
-      } else {
-        const siteID = options.siteID || process_1.env.SITE_ID;
-        if (!siteID) {
-          throw new Error("The Netlify site ID was not found in the execution environment. Please supply it manually using the `siteID` property.");
-        }
-        payload.site_id = siteID;
-      }
-      if (!token) {
-        throw new Error("The cache purge API token was not found in the execution environment. Please supply it manually using the `token` property.");
-      }
-      const apiURL = options.apiURL || "https://api.netlify.com";
-      const response = await fetch(`${apiURL}/api/v1/purge`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json; charset=utf8",
-          Authorization: `Bearer ${token}`
-        },
-        body: JSON.stringify(payload)
-      });
-      if (!response.ok) {
-        throw new Error(`Cache purge API call returned an unexpected status code: ${response.status}`);
-      }
-    };
-    exports2.purgeCache = purgeCache2;
+  const payload = {
+    cache_tags: options.tags,
+    deploy_alias: options.deployAlias
+  };
+  const token = import_process.env.NETLIFY_PURGE_API_TOKEN || options.token;
+  if (import_process.env.NETLIFY_LOCAL && !token) {
+    const scope = options.tags?.length ? ` for tags ${options.tags?.join(", ")}` : "";
+    console.log(`Skipping purgeCache${scope} in local development.`);
+    return;
   }
-});
-
-// node_modules/@netlify/functions/dist/lib/schedule.js
-var require_schedule = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/schedule.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.schedule = void 0;
-    var schedule = (cron, handler) => handler;
-    exports2.schedule = schedule;
+  if ("siteSlug" in options) {
+    payload.site_slug = options.siteSlug;
+  } else if ("domain" in options) {
+    payload.domain = options.domain;
+  } else {
+    const siteID = options.siteID || import_process.env.SITE_ID;
+    if (!siteID) {
+      throw new Error(
+        "The Netlify site ID was not found in the execution environment. Please supply it manually using the `siteID` property."
+      );
+    }
+    payload.site_id = siteID;
   }
-});
-
-// node_modules/@netlify/functions/dist/lib/stream.js
-var require_stream = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/stream.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    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) => {
-      const { body, ...httpResponseMetadata } = await handler(event, context);
-      const responseBody = awslambda.HttpResponseStream.from(responseStream, httpResponseMetadata);
-      if (typeof body === "undefined") {
-        responseBody.end();
-      } else if (typeof body === "string") {
-        responseBody.write(body);
-        responseBody.end();
-      } else {
-        await pipeline(body, responseBody);
-      }
-    });
-    exports2.stream = stream;
+  if (!token) {
+    throw new Error(
+      "The cache purge API token was not found in the execution environment. Please supply it manually using the `token` property."
+    );
   }
-});
-
-// node_modules/@netlify/functions/dist/function/index.js
-var require_function = __commonJS({
-  "node_modules/@netlify/functions/dist/function/index.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
+  const apiURL = options.apiURL || "https://api.netlify.com";
+  const response = await fetch(`${apiURL}/api/v1/purge`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json; charset=utf8",
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify(payload)
+  });
+  if (!response.ok) {
+    throw new Error(`Cache purge API call returned an unexpected status code: ${response.status}`);
   }
-});
+};
 
-// node_modules/@netlify/functions/dist/main.js
-var require_main = __commonJS({
-  "node_modules/@netlify/functions/dist/main.js"(exports2) {
-    "use strict";
-    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
-      if (k2 === void 0)
-        k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
-    } : function(o, m, k, k2) {
-      if (k2 === void 0)
-        k2 = k;
-      o[k2] = m[k];
-    });
-    var __exportStar = exports2 && exports2.__exportStar || function(m, exports3) {
-      for (var p in m)
-        if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p))
-          __createBinding(exports3, m, p);
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.stream = exports2.schedule = exports2.purgeCache = exports2.builder = void 0;
-    var builder_js_1 = require_builder();
-    Object.defineProperty(exports2, "builder", { enumerable: true, get: function() {
-      return builder_js_1.builder;
-    } });
-    var purge_cache_js_1 = require_purge_cache();
-    Object.defineProperty(exports2, "purgeCache", { enumerable: true, get: function() {
-      return purge_cache_js_1.purgeCache;
-    } });
-    var schedule_js_1 = require_schedule();
-    Object.defineProperty(exports2, "schedule", { enumerable: true, get: function() {
-      return schedule_js_1.schedule;
-    } });
-    var stream_js_1 = require_stream();
-    Object.defineProperty(exports2, "stream", { enumerable: true, get: function() {
-      return stream_js_1.stream;
-    } });
-    __exportStar(require_function(), exports2);
-  }
-});
+// node_modules/@netlify/functions/dist/chunk-XSZVKDJB.mjs
+var import_stream = require("stream");
+var import_util = require("util");
+var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 
 // src/run/handlers/cache.cts
-var cache_exports = {};
-__export(cache_exports, {
-  NetlifyCacheHandler: () => NetlifyCacheHandler,
-  default: () => cache_default
-});
-module.exports = __toCommonJS(cache_exports);
-var import_node_buffer = require("node:buffer");
-var import_functions = __toESM(require_main());
 var import_constants = require("next/dist/lib/constants.js");
 var import_regional_blob_store = require("../regional-blob-store.cjs");
 var import_request_context = require("./request-context.cjs");
@@ -391,7 +229,7 @@ var NetlifyCacheHandler = class {
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
           const tag = `_N_T_${key === "/index" ? "/" : key}`;
           console.debug("Purging CDN cache for:", [tag]);
-          (0, import_functions.purgeCache)({ tags: [tag] }).catch((error) => {
+          purgeCache({ tags: [tag] }).catch((error) => {
             console.error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`, error);
           });
         }
@@ -399,18 +237,26 @@ var NetlifyCacheHandler = class {
     });
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async revalidateTag(tag, ...args) {
-    console.debug("NetlifyCacheHandler.revalidateTag", tag, args);
+  async revalidateTag(tagOrTags, ...args) {
+    console.debug("NetlifyCacheHandler.revalidateTag", tagOrTags, args);
+    const tags = Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags];
     const data = {
       revalidatedAt: Date.now()
     };
-    try {
-      await this.blobStore.setJSON(await this.encodeBlobKey(tag), data);
-    } catch (error) {
-      console.warn(`Failed to update tag manifest for ${tag}`, error);
-    }
-    (0, import_functions.purgeCache)({ tags: [tag] }).catch((error) => {
-      console.error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`, error);
+    await Promise.all(
+      tags.map(async (tag) => {
+        try {
+          await this.blobStore.setJSON(await this.encodeBlobKey(tag), data);
+        } catch (error) {
+          console.warn(`Failed to update tag manifest for ${tag}`, error);
+        }
+      })
+    );
+    purgeCache({ tags }).catch((error) => {
+      console.error(
+        `[NetlifyCacheHandler]: Purging the cache for tags ${tags.join(", ")} failed`,
+        error
+      );
     });
   }
   resetRequestCache() {

package/dist/run/handlers/tracing.js

@@ -67768,7 +67768,7 @@ var import_sdk_trace_node = __toESM(require_src20(), 1);
 var import_semantic_conventions = __toESM(require_src(), 1);
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-SCUAWNXR.js");
+} = await import("../../esm-chunks/package-YOCAX5OR.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,

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/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
@@ -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.2.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",