@netlify/plugin-nextjs 5.9.3-background-debug-logs.0 → 5.9.3

package/dist/esm-chunks/{chunk-FB56KFLR.js → chunk-LVXJQ2G2.js}

@@ -103,22 +103,13 @@ init_internal();
 // src/run/handlers/request-context.cts
 function createRequestContext(request, context) {
   const backgroundWorkPromises = [];
-  let backgroundWorkCounter = 0;
   return {
     captureServerTiming: request?.headers.has("x-next-debug-logging") ?? false,
-    trackBackgroundWork: (promise, description) => {
-      backgroundWorkCounter += 1;
-      const counter = backgroundWorkCounter;
-      const label = `background #${counter} - ${description ?? "unknown"} - ${context?.requestId}`;
-      const start = Date.now();
-      console.log(`Start ${label}`);
-      const trackedPromise = promise.finally(() => {
-        console.log(`End ${label} - ${(Date.now() - start) / 1e3}s`);
-      });
+    trackBackgroundWork: (promise) => {
       if (context?.waitUntil) {
-        context.waitUntil(trackedPromise);
+        context.waitUntil(promise);
       } else {
-        backgroundWorkPromises.push(trackedPromise);
+        backgroundWorkPromises.push(promise);
       }
     },
     get backgroundWorkPromise() {

package/dist/esm-chunks/{chunk-PG4KVN6X.js → chunk-NEZW7TGG.js}

@@ -6,7 +6,7 @@
     
 import {
   getRequestContext
-} from "./chunk-FB56KFLR.js";
+} from "./chunk-LVXJQ2G2.js";
 import {
   wrapTracer
 } from "./chunk-5QSXBV7L.js";

package/dist/esm-chunks/{chunk-5N54G5SN.js → chunk-XS27YRA5.js}

@@ -19,7 +19,7 @@ var nextResponseProxy = (res, requestContext) => {
           requestContext.didPagesRouterOnDemandRevalidate = true;
           const result = originalValue.apply(target, args);
           if (result && isPromise(result)) {
-            requestContext.trackBackgroundWork(result, "res.revalidate");
+            requestContext.trackBackgroundWork(result);
           }
           return result;
         };

package/dist/esm-chunks/{next-FWMVEHSM.js → next-H2VMRX5P.js}

@@ -6,10 +6,10 @@
     
 import {
   getTracer
-} from "./chunk-PG4KVN6X.js";
+} from "./chunk-NEZW7TGG.js";
 import {
   getRequestContext
-} from "./chunk-FB56KFLR.js";
+} from "./chunk-LVXJQ2G2.js";
 import {
   getRegionalBlobStore
 } from "./chunk-K4RDUZYO.js";
@@ -490,10 +490,7 @@ ResponseCache.prototype.get = function get(...getArgs) {
           const workPromise = fn(...workFnArgs);
           const requestContext = getRequestContext();
           if (requestContext && workPromise instanceof Promise) {
-            requestContext.trackBackgroundWork(
-              workPromise,
-              `responseCache batcher ${JSON.stringify(key)}`
-            );
+            requestContext.trackBackgroundWork(workPromise);
           }
           return await workPromise;
         };
@@ -508,10 +505,7 @@ ResponseCache.prototype.get = function get(...getArgs) {
           const workPromise = new Promise((_resolve) => {
             backgroundWork.set(key, _resolve);
           });
-          requestContext.trackBackgroundWork(
-            workPromise,
-            `responseCache pendingResponses ${JSON.stringify(key)}`
-          );
+          requestContext.trackBackgroundWork(workPromise);
         }
         return originalPendingResponsesSet.call(this.pendingResponses, key, value);
       };

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

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

package/dist/index.js

@@ -4,9 +4,18 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  clearStaleEdgeHandlers,
+  createEdgeHandlers
+} from "./esm-chunks/chunk-HGXG447M.js";
+import {
+  clearStaleServerHandlers,
+  createServerHandler
+} from "./esm-chunks/chunk-DLVROEVU.js";
 import {
   copyPrerenderedContent
 } from "./esm-chunks/chunk-J4D25YDX.js";
+import "./esm-chunks/chunk-IJZEDP6B.js";
 import {
   copyStaticAssets,
   copyStaticContent,
@@ -14,15 +23,6 @@ import {
   publishStaticDir,
   unpublishStaticDir
 } from "./esm-chunks/chunk-NTLBFRPA.js";
-import {
-  clearStaleEdgeHandlers,
-  createEdgeHandlers
-} from "./esm-chunks/chunk-HGXG447M.js";
-import {
-  clearStaleServerHandlers,
-  createServerHandler
-} from "./esm-chunks/chunk-DLVROEVU.js";
-import "./esm-chunks/chunk-IJZEDP6B.js";
 import {
   wrapTracer
 } from "./esm-chunks/chunk-5QSXBV7L.js";

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.3-background-debug-logs.0";
+var version = "5.9.3";
 
 // src/shared/cache-types.cts
 var isCachedPageValue = (value) => value.kind === "PAGE" || value.kind === "PAGES";
@@ -2022,8 +2022,7 @@ var NetlifyCacheHandler = class {
           requestContext.trackBackgroundWork(
             purgeCache({ tags, userAgent: purgeCacheUserAgent }).catch((error) => {
               getLogger().withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`);
-            }),
-            `cdn purge after page router .revalidate ${tag}`
+            })
           );
         }
       }
@@ -2034,10 +2033,7 @@ var NetlifyCacheHandler = class {
     const revalidateTagPromise = this.doRevalidateTag(tagOrTags, ...args);
     const requestContext = getRequestContext();
     if (requestContext) {
-      requestContext.trackBackgroundWork(
-        revalidateTagPromise,
-        `revalidateTag ${JSON.stringify(tagOrTags)}`
-      );
+      requestContext.trackBackgroundWork(revalidateTagPromise);
     }
     return revalidateTagPromise;
   }

package/dist/run/handlers/request-context.cjs

@@ -123,22 +123,13 @@ init_internal();
 // src/run/handlers/request-context.cts
 function createRequestContext(request, context) {
   const backgroundWorkPromises = [];
-  let backgroundWorkCounter = 0;
   return {
     captureServerTiming: request?.headers.has("x-next-debug-logging") ?? false,
-    trackBackgroundWork: (promise, description) => {
-      backgroundWorkCounter += 1;
-      const counter = backgroundWorkCounter;
-      const label = `background #${counter} - ${description ?? "unknown"} - ${context?.requestId}`;
-      const start = Date.now();
-      console.log(`Start ${label}`);
-      const trackedPromise = promise.finally(() => {
-        console.log(`End ${label} - ${(Date.now() - start) / 1e3}s`);
-      });
+    trackBackgroundWork: (promise) => {
       if (context?.waitUntil) {
-        context.waitUntil(trackedPromise);
+        context.waitUntil(promise);
       } else {
-        backgroundWorkPromises.push(trackedPromise);
+        backgroundWorkPromises.push(promise);
       }
     },
     get backgroundWorkPromise() {

package/dist/run/handlers/server.js

@@ -6,12 +6,12 @@
     
 import {
   getTracer
-} from "../../esm-chunks/chunk-PG4KVN6X.js";
+} from "../../esm-chunks/chunk-NEZW7TGG.js";
 import {
   createRequestContext,
   getLogger,
   getRequestContext
-} from "../../esm-chunks/chunk-FB56KFLR.js";
+} from "../../esm-chunks/chunk-LVXJQ2G2.js";
 import {
   adjustDateHeader,
   setCacheControlHeaders,
@@ -22,7 +22,7 @@ import {
 import "../../esm-chunks/chunk-K4RDUZYO.js";
 import {
   nextResponseProxy
-} from "../../esm-chunks/chunk-5N54G5SN.js";
+} from "../../esm-chunks/chunk-XS27YRA5.js";
 import "../../esm-chunks/chunk-5QSXBV7L.js";
 import "../../esm-chunks/chunk-GNGHTHMQ.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
@@ -3118,16 +3118,13 @@ function setupWaitUntil() {
   ;
   globalThis[NEXT_REQUEST_CONTEXT_SYMBOL] = {
     get() {
-      const trackBackgroundWork = getRequestContext()?.trackBackgroundWork;
-      return {
-        waitUntil: trackBackgroundWork ? (promise) => trackBackgroundWork(promise, "after()") : void 0
-      };
+      return { waitUntil: getRequestContext()?.trackBackgroundWork };
     }
   };
 }
 
 // src/run/handlers/server.ts
-var nextImportPromise = import("../../esm-chunks/next-FWMVEHSM.js");
+var nextImportPromise = import("../../esm-chunks/next-H2VMRX5P.js");
 setupWaitUntil();
 var nextHandler;
 var nextConfig;
@@ -3144,10 +3141,7 @@ var disableFaultyTransferEncodingHandling = (res) => {
     return originalStoreHeader.call(this, firstLine, headers);
   };
 };
-var server_default = async (request, context) => {
-  const label = `response - ${request.url} - ${context.requestId}`;
-  const start = Date.now();
-  console.log(`Start ${label}`);
+var server_default = async (request) => {
   const tracer = getTracer();
   if (!nextHandler) {
     await tracer.withActiveSpan("initialize next server", async () => {
@@ -3202,7 +3196,6 @@ var server_default = async (request, context) => {
     const keepOpenUntilNextFullyRendered = new TransformStream({
       async flush() {
         await nextHandlerPromise;
-        console.log(`End ${label} - ${(Date.now() - start) / 1e3}s`);
         res.emit("close");
         await requestContext.backgroundWorkPromise;
       }

package/dist/run/handlers/tracing.js

@@ -6,7 +6,7 @@
     
 import {
   getLogger
-} from "../../esm-chunks/chunk-FB56KFLR.js";
+} from "../../esm-chunks/chunk-LVXJQ2G2.js";
 import {
   esm_exports,
   init_esm
@@ -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-W4QAAZFL.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/dist/run/handlers/wait-until.cjs

@@ -143,10 +143,7 @@ function setupWaitUntil() {
   ;
   globalThis[NEXT_REQUEST_CONTEXT_SYMBOL] = {
     get() {
-      const trackBackgroundWork = getRequestContext()?.trackBackgroundWork;
-      return {
-        waitUntil: trackBackgroundWork ? (promise) => trackBackgroundWork(promise, "after()") : void 0
-      };
+      return { waitUntil: getRequestContext()?.trackBackgroundWork };
     }
   };
 }

package/dist/run/next.cjs

@@ -2119,10 +2119,7 @@ ResponseCache.prototype.get = function get(...getArgs) {
           const workPromise = fn(...workFnArgs);
           const requestContext = getRequestContext();
           if (requestContext && workPromise instanceof Promise) {
-            requestContext.trackBackgroundWork(
-              workPromise,
-              `responseCache batcher ${JSON.stringify(key)}`
-            );
+            requestContext.trackBackgroundWork(workPromise);
           }
           return await workPromise;
         };
@@ -2137,10 +2134,7 @@ ResponseCache.prototype.get = function get(...getArgs) {
           const workPromise = new Promise((_resolve) => {
             backgroundWork.set(key, _resolve);
           });
-          requestContext.trackBackgroundWork(
-            workPromise,
-            `responseCache pendingResponses ${JSON.stringify(key)}`
-          );
+          requestContext.trackBackgroundWork(workPromise);
         }
         return originalPendingResponsesSet.call(this.pendingResponses, key, value);
       };

package/dist/run/revalidate.js

@@ -6,7 +6,7 @@
     
 import {
   nextResponseProxy
-} from "../esm-chunks/chunk-5N54G5SN.js";
+} from "../esm-chunks/chunk-XS27YRA5.js";
 import "../esm-chunks/chunk-OEQOKJGE.js";
 export {
   nextResponseProxy

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.3-background-debug-logs.0",
+  "version": "5.9.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",