@netlify/plugin-nextjs 5.9.2 → 5.9.3

package/dist/esm-chunks/{package-36IBNZ37.js → package-MI2MBCHL.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.9.2";
+var version = "5.9.3";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";

package/dist/run/handlers/cache.cjs

@@ -203,7 +203,7 @@ var import_constants = require("next/dist/lib/constants.js");
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.9.2";
+var version = "5.9.3";
 
 // src/shared/cache-types.cts
 var isCachedPageValue = (value) => value.kind === "PAGE" || value.kind === "PAGES";

package/dist/run/handlers/tracing.js

@@ -68868,7 +68868,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-36IBNZ37.js");
+} = await import("../../esm-chunks/package-MI2MBCHL.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,

package/edge-runtime/lib/response.ts

@@ -14,6 +14,8 @@ import {
   normalizeLocalePath,
   normalizeTrailingSlash,
   relativizeURL,
+  removeBasePath,
+  rewriteDataPath,
 } from './util.ts'
 
 export interface FetchEventResult {
@@ -180,14 +182,16 @@ export const buildResponse = async ({
     }
 
     if (isDataReq) {
-      // 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 = rewriteDataPath({
+        dataUrl: new URL(request.url).pathname,
+        newRoute: removeBasePath(rewriteUrl.pathname, nextConfig?.basePath),
+        basePath: nextConfig?.basePath,
+      })
+    } else {
+      // respect trailing slash rules to prevent 308s
+      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.9.2",
+  "version": "5.9.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",