@netlify/plugin-nextjs 5.3.2 → 5.3.3

package/README.md

@@ -1,6 +1,6 @@
-![Next.js Runtime](https://github.com/netlify/next-runtime/raw/main/next-js-runtime.png)
+![Next.js Runtime](next-js-runtime.png)
 
-# `@netlify/plugin-nextjs`
+# Next.js Runtime
 
 <p align="center">
   <a aria-label="npm version" href="https://www.npmjs.com/package/@netlify/plugin-nextjs">
@@ -16,3 +16,63 @@ Netlify. You should not normally need to install it yourself, as it is used auto
 builds of Next.js sites. See
 [the docs for using Next.js on Netlify](https://docs.netlify.com/frameworks/next-js/overview/) for
 more details.
+
+Next.js is supported natively on Netlify, and in most cases you will not need to install or
+configure anything. This repo includes the packages used to support Next.js on Netlify.
+
+## Prerequisites
+
+- Next.js 13.5 or later
+- Node.js 18 or later
+- The latest version of the [Netlify CLI](https://docs.netlify.com/cli/get-started/)
+
+## Deploying
+
+If you build on Netlify, the Next.js Runtime will work with no additional configuration.
+
+## Manually installing the Next.js Runtime
+
+The Next.js Runtime installs automatically for new Next.js sites on Netlify. You can also install it
+manually in the following ways:
+
+### From the UI (Recommended)
+
+You can go to the [UI](https://app.netlify.com/plugins/@netlify/plugin-nextjs/install) and choose
+the site to install the Next.js Runtime on. This method is recommended because you will benefit from
+auto-upgrades to important fixes and feature updates.
+
+### From `npm`
+
+```shell
+npm install -D @netlify/plugin-nextjs
+```
+
+...then add the following to your `netlify.toml` file:
+
+```toml
+[[plugins]]
+  package = "@netlify/plugin-nextjs"
+```
+
+This method is recommended if you wish to pin the Next.js Runtime to a specific version.
+
+## v4
+
+If you are using Next.js 10-13.4 or Node.js < 18, you must use v4 of the Next.js Runtime.
+
+If you are still using v4, you can find
+[its README here](https://github.com/netlify/next-runtime/blob/v4/README.md) and the
+[v4 Runtime docs here](https://docs.netlify.com/frameworks/next-js/runtime-v4/overview/).
+
+### Upgrading from v4 to v5
+
+To upgrade from v4 to v5, please visit
+[the v5 documentation](https://docs.netlify.com/frameworks/next-js/overview/).
+
+## Feedback
+
+If you think you have found a bug in Next.js on Netlify,
+[please open an issue](https://github.com/netlify/next-runtime/issues). If you have comments or
+feature requests, [see the discussion board](https://github.com/netlify/next-runtime/discussions)
+
+Please note that v4 will only receive security fixes and critical bug fixes.

package/dist/build/content/prerendered.js

@@ -14,6 +14,9 @@ import {
   init_esm,
   trace
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
+import {
+  require_semver
+} from "../../esm-chunks/chunk-EFGWM7RS.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-OEQOKJGE.js";
@@ -132,6 +135,7 @@ function pLimit(concurrency) {
 }
 
 // src/build/content/prerendered.ts
+var import_semver = __toESM(require_semver(), 1);
 import { encodeBlobKey } from "../../shared/blobkey.js";
 var tracer = wrapTracer(trace.getTracer("Next runtime"));
 var writeCacheEntry = async (route, value, lastModified, ctx) => {
@@ -147,12 +151,22 @@ var buildPagesCacheValue = async (path) => ({
   kind: "PAGE",
   html: await readFile(`${path}.html`, "utf-8"),
   pageData: JSON.parse(await readFile(`${path}.json`, "utf-8")),
-  postponed: void 0,
   headers: void 0,
   status: void 0
 });
-var buildAppCacheValue = async (path) => {
+var buildAppCacheValue = async (path, shouldUseAppPageKind) => {
   const meta = JSON.parse(await readFile(`${path}.meta`, "utf-8"));
+  const html = await readFile(`${path}.html`, "utf-8");
+  if (shouldUseAppPageKind) {
+    return {
+      kind: "APP_PAGE",
+      html,
+      rscData: await readFile(`${path}.rsc`, "base64").catch(
+        () => readFile(`${path}.prefetch.rsc`, "base64")
+      ),
+      ...meta
+    };
+  }
   const rsc = await readFile(`${path}.rsc`, "utf-8").catch(
     () => readFile(`${path}.prefetch.rsc`, "utf-8")
   );
@@ -161,7 +175,7 @@ var buildAppCacheValue = async (path) => {
   }
   return {
     kind: "PAGE",
-    html: await readFile(`${path}.html`, "utf-8"),
+    html,
     pageData: rsc,
     ...meta
   };
@@ -182,6 +196,9 @@ var copyPrerenderedContent = async (ctx) => {
       await mkdir(ctx.blobDir, { recursive: true });
       const manifest = await ctx.getPrerenderManifest();
       const limitConcurrentPrerenderContentHandling = pLimit(10);
+      const shouldUseAppPageKind = ctx.nextVersion ? (0, import_semver.satisfies)(ctx.nextVersion, ">=15.0.0-canary.13 <15.0.0-d || >15.0.0-rc.0", {
+        includePrerelease: true
+      }) : false;
       await Promise.all(
         Object.entries(manifest.routes).map(
           ([route, meta]) => limitConcurrentPrerenderContentHandling(async () => {
@@ -198,7 +215,10 @@ var copyPrerenderedContent = async (ctx) => {
                 value = await buildPagesCacheValue(join(ctx.publishDir, "server/pages", key));
                 break;
               case meta.dataRoute?.endsWith(".rsc"):
-                value = await buildAppCacheValue(join(ctx.publishDir, "server/app", key));
+                value = await buildAppCacheValue(
+                  join(ctx.publishDir, "server/app", key),
+                  shouldUseAppPageKind
+                );
                 break;
               case meta.dataRoute === null:
                 value = await buildRouteCacheValue(
@@ -216,7 +236,10 @@ var copyPrerenderedContent = async (ctx) => {
       if (existsSync(join(ctx.publishDir, `server/app/_not-found.html`))) {
         const lastModified = Date.now();
         const key = "/404";
-        const value = await buildAppCacheValue(join(ctx.publishDir, "server/app/_not-found"));
+        const value = await buildAppCacheValue(
+          join(ctx.publishDir, "server/app/_not-found"),
+          shouldUseAppPageKind
+        );
         await writeCacheEntry(key, value, lastModified, ctx);
       }
     } catch (error) {

package/dist/build/content/server.js

@@ -28,8 +28,8 @@ import {
   access,
   cp,
   mkdir,
-  readFile,
   readdir,
+  readFile,
   readlink,
   symlink,
   writeFile
@@ -40,8 +40,6 @@ import { join as posixJoin, sep as posixSep } from "node:path/posix";
 var import_fast_glob = __toESM(require_out(), 1);
 var import_semver = __toESM(require_semver(), 1);
 import { RUN_CONFIG } from "../../run/constants.js";
-import { logger } from "../../run/systemlog.cjs";
-import { verifyNextVersion } from "../verification.js";
 var tracer = wrapTracer(trace.getTracer("Next runtime"));
 var toPosixPath = (path) => path.split(sep).join(posixSep);
 function isError(error) {
@@ -192,17 +190,8 @@ var copyNextDependencies = async (ctx) => {
     }
     await Promise.all(promises);
     const serverHandlerRequire = createRequire(posixJoin(ctx.serverHandlerDir, ":internal:"));
-    let nextVersion;
-    try {
-      const { version } = serverHandlerRequire("next/package.json");
-      if (version) {
-        nextVersion = version;
-      }
-    } catch {
-    }
-    if (nextVersion) {
-      verifyNextVersion(ctx, nextVersion);
-      await patchNextModules(ctx, nextVersion, serverHandlerRequire.resolve);
+    if (ctx.nextVersion) {
+      await patchNextModules(ctx, ctx.nextVersion, serverHandlerRequire.resolve);
     }
     try {
       const nextEntryAbsolutePath = serverHandlerRequire.resolve("next");
@@ -227,7 +216,7 @@ var writeTagsManifest = async (ctx) => {
         tags = meta.headers["x-next-cache-tags"];
       } catch {
         if (!definition.dataRoute?.endsWith("/default.rsc")) {
-          logger.log(`Unable to read cache tags for: ${path}`);
+          console.log(`Unable to read cache tags for: ${path}`);
         }
       }
     }

package/dist/build/plugin-context.js

@@ -15,7 +15,9 @@ import {
 var import_semver = __toESM(require_semver(), 1);
 import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { join, relative, resolve } from "node:path";
+import { join as posixJoin } from "node:path/posix";
 import { fileURLToPath } from "node:url";
 var MODULE_DIR = fileURLToPath(new URL(".", import.meta.url));
 var PLUGIN_DIR = join(MODULE_DIR, "../..");
@@ -248,6 +250,22 @@ var PluginContext = class {
   async getRoutesManifest() {
     return JSON.parse(await readFile(join(this.publishDir, "routes-manifest.json"), "utf-8"));
   }
+  #nextVersion = void 0;
+  /**
+   * Get Next.js version that was used to build the site
+   */
+  get nextVersion() {
+    if (this.#nextVersion === void 0) {
+      try {
+        const serverHandlerRequire = createRequire(posixJoin(this.standaloneRootDir, ":internal:"));
+        const { version } = serverHandlerRequire("next/package.json");
+        this.#nextVersion = version;
+      } catch {
+        this.#nextVersion = null;
+      }
+    }
+    return this.#nextVersion;
+  }
   /** Fails a build with a message and an optional error */
   failBuild(message, error) {
     return this.utils.build.failBuild(message, error instanceof Error ? { error } : void 0);

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

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

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

@@ -13,7 +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-next-debug-logging'))
+  const requestContext = createRequestContext(req)
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {

package/dist/build/verification.js

@@ -46,6 +46,11 @@ function verifyPublishDir(ctx) {
         `Your publish directory does not contain expected Next.js build output. Please make sure you are using Next.js version (${SUPPORTED_NEXT_VERSIONS})`
       );
     }
+    if (ctx.nextVersion && !(0, import_semver.satisfies)(ctx.nextVersion, SUPPORTED_NEXT_VERSIONS, { includePrerelease: true })) {
+      ctx.failBuild(
+        `@netlify/plugin-next@5 requires Next.js version ${SUPPORTED_NEXT_VERSIONS}, but found ${ctx.nextVersion}. Please upgrade your project's Next.js version.`
+      );
+    }
   }
   if (ctx.buildConfig.output === "export") {
     if (!ctx.exportDetail?.success) {
@@ -58,13 +63,6 @@ function verifyPublishDir(ctx) {
     }
   }
 }
-function verifyNextVersion(ctx, nextVersion) {
-  if (!(0, import_semver.satisfies)(nextVersion, SUPPORTED_NEXT_VERSIONS, { includePrerelease: true })) {
-    ctx.failBuild(
-      `@netlify/plugin-next@5 requires Next.js version ${SUPPORTED_NEXT_VERSIONS}, but found ${nextVersion}. Please upgrade your project's Next.js version.`
-    );
-  }
-}
 async function verifyNoAdvancedAPIRoutes(ctx) {
   const apiRoutesConfigs = await getAPIRoutesConfigs(ctx);
   const unsupportedAPIRoutes = apiRoutesConfigs.filter((apiRouteConfig) => {
@@ -80,7 +78,6 @@ Refer to https://ntl.fyi/next-scheduled-bg-function-migration as migration examp
   }
 }
 export {
-  verifyNextVersion,
   verifyNoAdvancedAPIRoutes,
   verifyPublishDir
 };

package/dist/esm-chunks/{package-NUPTPA44.js → package-7AUBRXLQ.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.3.2";
+var version = "5.3.3";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -42,7 +42,7 @@ var scripts = {
 };
 var repository = {
   type: "git",
-  url: "git+https://github.com/netlify/next-runtime-minimal.git"
+  url: "git+https://github.com/netlify/next-runtime.git"
 };
 var keywords = [
   "nextjs",
@@ -52,19 +52,19 @@ var keywords = [
 ];
 var license = "MIT";
 var bugs = {
-  url: "https://github.com/netlify/next-runtime-minimal/issues"
+  url: "https://github.com/netlify/next-runtime/issues"
 };
-var homepage = "https://github.com/netlify/next-runtime-minimal#readme";
+var homepage = "https://github.com/netlify/next-runtime#readme";
 var devDependencies = {
   "@fastly/http-compute-js": "1.1.4",
   "@netlify/blobs": "^7.3.0",
-  "@netlify/build": "^29.43.0",
+  "@netlify/build": "^29.48.1",
   "@netlify/edge-bundler": "^12.0.1",
   "@netlify/edge-functions": "^2.8.1",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.7.0",
-  "@netlify/serverless-functions-api": "^1.18.2",
-  "@netlify/zip-it-and-ship-it": "^9.33.2",
+  "@netlify/serverless-functions-api": "^1.18.4",
+  "@netlify/zip-it-and-ship-it": "^9.37.0",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
   "@opentelemetry/resources": "^1.24.0",
@@ -87,7 +87,7 @@ var devDependencies = {
   memfs: "^4.9.2",
   "mock-require": "^3.0.3",
   msw: "^2.0.7",
-  next: "^14.0.4",
+  next: "^15.0.0-canary.28",
   os: "^0.1.2",
   outdent: "^0.8.0",
   "p-limit": "^5.0.0",

package/dist/run/config.js

@@ -21,6 +21,8 @@ var setRunConfig = (config) => {
   }
   config.experimental = {
     ...config.experimental,
+    // @ts-expect-error incrementalCacheHandlerPath was removed from config type
+    // but we still need to set it for older Next.js versions
     incrementalCacheHandlerPath: cacheHandler
   };
   config.cacheHandler = cacheHandler;

package/dist/run/handlers/cache.cjs

@@ -35,6 +35,8 @@ __export(cache_exports, {
 });
 module.exports = __toCommonJS(cache_exports);
 var import_node_buffer = require("node:buffer");
+var import_node_path = require("node:path");
+var import_posix = require("node:path/posix");
 
 // node_modules/@netlify/functions/dist/chunk-COIAWFHF.mjs
 var import_process = require("process");
@@ -94,7 +96,6 @@ var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 // src/run/handlers/cache.cts
 var import_constants = require("next/dist/lib/constants.js");
 var import_regional_blob_store = require("../regional-blob-store.cjs");
-var import_systemlog = require("../systemlog.cjs");
 var import_request_context = require("./request-context.cjs");
 var import_tracer = require("./tracer.cjs");
 var NetlifyCacheHandler = class {
@@ -154,10 +155,37 @@ var NetlifyCacheHandler = class {
     }
     return restOfRouteValue;
   }
+  async injectEntryToPrerenderManifest(key, revalidate) {
+    if (this.options.serverDistDir && (typeof revalidate === "number" || revalidate === false)) {
+      try {
+        const { loadManifest } = await import("next/dist/server/load-manifest.js");
+        const prerenderManifest = loadManifest(
+          (0, import_node_path.join)(this.options.serverDistDir, "..", "prerender-manifest.json")
+        );
+        try {
+          const { normalizePagePath } = await import("next/dist/shared/lib/page-path/normalize-page-path.js");
+          prerenderManifest.routes[key] = {
+            experimentalPPR: void 0,
+            dataRoute: (0, import_posix.join)("/_next/data", `${normalizePagePath(key)}.json`),
+            srcRoute: null,
+            // FIXME: provide actual source route, however, when dynamically appending it doesn't really matter
+            initialRevalidateSeconds: revalidate,
+            // Pages routes do not have a prefetch data route.
+            prefetchDataRoute: void 0
+          };
+        } catch {
+          const { SharedRevalidateTimings } = await import("next/dist/server/lib/incremental-cache/shared-revalidate-timings.js");
+          const sharedRevalidateTimings = new SharedRevalidateTimings(prerenderManifest);
+          sharedRevalidateTimings.set(key, revalidate);
+        }
+      } catch {
+      }
+    }
+  }
   async get(...args) {
     return this.tracer.withActiveSpan("get cache key", async (span) => {
       const [key, ctx = {}] = args;
-      import_systemlog.logger.debug(`[NetlifyCacheHandler.get]: ${key}`);
+      (0, import_request_context.getLogger)().debug(`[NetlifyCacheHandler.get]: ${key}`);
       const blobKey = await this.encodeBlobKey(key);
       span.setAttributes({ key, blobKey });
       const blob = await this.tracer.withActiveSpan("blobStore.get", async (blobGetSpan) => {
@@ -194,33 +222,64 @@ var NetlifyCacheHandler = class {
             }
           };
         }
-        case "PAGE":
+        case "PAGE": {
           span.addEvent("PAGE", { lastModified: blob.lastModified });
+          const { revalidate, ...restOfPageValue } = blob.value;
+          await this.injectEntryToPrerenderManifest(key, revalidate);
           return {
             lastModified: blob.lastModified,
-            value: blob.value
+            value: restOfPageValue
+          };
+        }
+        case "APP_PAGE": {
+          span.addEvent("APP_PAGE", { lastModified: blob.lastModified });
+          const { revalidate, rscData, ...restOfPageValue } = blob.value;
+          await this.injectEntryToPrerenderManifest(key, revalidate);
+          return {
+            lastModified: blob.lastModified,
+            value: {
+              ...restOfPageValue,
+              rscData: rscData ? import_node_buffer.Buffer.from(rscData, "base64") : void 0
+            }
           };
+        }
         default:
           span.recordException(new Error(`Unknown cache entry kind: ${blob.value?.kind}`));
       }
       return null;
     });
   }
+  transformToStorableObject(data, context) {
+    if (data?.kind === "ROUTE") {
+      return {
+        ...data,
+        revalidate: context.revalidate,
+        body: data.body.toString("base64")
+      };
+    }
+    if (data?.kind === "PAGE") {
+      return {
+        ...data,
+        revalidate: context.revalidate
+      };
+    }
+    if (data?.kind === "APP_PAGE") {
+      return {
+        ...data,
+        revalidate: context.revalidate,
+        rscData: data.rscData?.toString("base64")
+      };
+    }
+    return data;
+  }
   async set(...args) {
     return this.tracer.withActiveSpan("set cache key", async (span) => {
       const [key, data, context] = args;
       const blobKey = await this.encodeBlobKey(key);
       const lastModified = Date.now();
       span.setAttributes({ key, lastModified, blobKey });
-      import_systemlog.logger.debug(`[NetlifyCacheHandler.set]: ${key}`);
-      const value = data?.kind === "ROUTE" ? (
-        // don't mutate data, as it's used for the initial response - instead create a new object
-        {
-          ...data,
-          revalidate: context.revalidate,
-          body: data.body.toString("base64")
-        }
-      ) : data;
+      (0, import_request_context.getLogger)().debug(`[NetlifyCacheHandler.set]: ${key}`);
+      const value = this.transformToStorableObject(data, context);
       await this.blobStore.setJSON(blobKey, {
         lastModified,
         value
@@ -229,9 +288,9 @@ var NetlifyCacheHandler = class {
         const requestContext = (0, import_request_context.getRequestContext)();
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
           const tag = `_N_T_${key === "/index" ? "/" : key}`;
-          import_systemlog.logger.debug(`Purging CDN cache for: [${tag}]`);
+          (0, import_request_context.getLogger)().debug(`Purging CDN cache for: [${tag}]`);
           purgeCache({ tags: [tag] }).catch((error) => {
-            import_systemlog.logger.withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`);
+            (0, import_request_context.getLogger)().withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`);
           });
         }
       }
@@ -239,7 +298,7 @@ var NetlifyCacheHandler = class {
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async revalidateTag(tagOrTags, ...args) {
-    import_systemlog.logger.withFields({ tagOrTags, args }).debug("NetlifyCacheHandler.revalidateTag");
+    (0, import_request_context.getLogger)().withFields({ tagOrTags, args }).debug("NetlifyCacheHandler.revalidateTag");
     const tags = Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags];
     const data = {
       revalidatedAt: Date.now()
@@ -249,12 +308,12 @@ var NetlifyCacheHandler = class {
         try {
           await this.blobStore.setJSON(await this.encodeBlobKey(tag), data);
         } catch (error) {
-          import_systemlog.logger.withError(error).log(`Failed to update tag manifest for ${tag}`);
+          (0, import_request_context.getLogger)().withError(error).log(`Failed to update tag manifest for ${tag}`);
         }
       })
     );
     purgeCache({ tags }).catch((error) => {
-      import_systemlog.logger.withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tags ${tags.join(", ")} failed`);
+      (0, import_request_context.getLogger)().withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tags ${tags.join(", ")} failed`);
     });
   }
   resetRequestCache() {
@@ -267,7 +326,7 @@ var NetlifyCacheHandler = class {
     let cacheTags = [];
     if (cacheEntry.value?.kind === "FETCH") {
       cacheTags = [...tags, ...softTags];
-    } else if (cacheEntry.value?.kind === "PAGE" || cacheEntry.value?.kind === "ROUTE") {
+    } else if (cacheEntry.value?.kind === "PAGE" || cacheEntry.value?.kind === "APP_PAGE" || cacheEntry.value?.kind === "ROUTE") {
       cacheTags = cacheEntry.value.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]?.split(",") || [];
     } else {
       return false;

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

@@ -21,21 +21,94 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var request_context_exports = {};
 __export(request_context_exports, {
   createRequestContext: () => createRequestContext,
+  getLogger: () => getLogger,
   getRequestContext: () => getRequestContext,
   runWithRequestContext: () => runWithRequestContext
 });
 module.exports = __toCommonJS(request_context_exports);
 var import_node_async_hooks = require("node:async_hooks");
-function createRequestContext(debug = false) {
+
+// 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();
+
+// src/run/handlers/request-context.cts
+function createRequestContext(request) {
   const backgroundWorkPromises = [];
   return {
-    debug,
+    captureServerTiming: request?.headers.has("x-next-debug-logging") ?? false,
     trackBackgroundWork: (promise) => {
       backgroundWorkPromises.push(promise);
     },
     get backgroundWorkPromise() {
       return Promise.allSettled(backgroundWorkPromises);
-    }
+    },
+    logger: systemLogger.withLogLevel(
+      request?.headers.has("x-nf-debug-logging") || request?.headers.has("x-next-debug-logging") ? LogLevel.Debug : LogLevel.Log
+    )
   };
 }
 var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");
@@ -57,9 +130,13 @@ var getRequestContext = () => getRequestContextAsyncLocalStorage().getStore();
 function runWithRequestContext(requestContext, fn) {
   return getRequestContextAsyncLocalStorage().run(requestContext, fn);
 }
+function getLogger() {
+  return getRequestContext()?.logger ?? systemLogger;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createRequestContext,
+  getLogger,
   getRequestContext,
   runWithRequestContext
 });

package/dist/run/handlers/server.js

@@ -3100,8 +3100,7 @@ import {
   setVaryHeaders
 } from "../headers.js";
 import { nextResponseProxy } from "../revalidate.js";
-import { logger } from "../systemlog.cjs";
-import { createRequestContext, getRequestContext } from "./request-context.cjs";
+import { createRequestContext, getLogger, getRequestContext } from "./request-context.cjs";
 import { getTracer } from "./tracer.cjs";
 var nextImportPromise = import("../next.cjs");
 var nextHandler;
@@ -3163,7 +3162,7 @@ var server_default = async (request, context) => {
     const requestContext = getRequestContext() ?? createRequestContext();
     const resProxy = nextResponseProxy(res, requestContext);
     const nextHandlerPromise = nextHandler(req, resProxy).catch((error) => {
-      logger.withError(error).error("next handler error");
+      getLogger().withError(error).error("next handler error");
       console.error(error);
       resProxy.statusCode = 500;
       span.setAttribute("http.status_code", 500);

package/dist/run/handlers/tracer.cjs

@@ -856,7 +856,7 @@ function spanHook(span) {
     const meta = spanMeta.get(span);
     if (meta) {
       const requestContext = (0, import_request_context.getRequestContext)();
-      if (requestContext?.debug) {
+      if (requestContext?.captureServerTiming) {
         const duration = (typeof endTime === "number" ? endTime : performance.now()) - meta.start;
         const serverTiming = requestContext.serverTiming ?? "";
         const currentRequestSpanCounter = spanCounter.get(requestContext) ?? 1;

package/dist/run/handlers/tracing.js

@@ -25421,7 +25421,7 @@ var require_shimmer = __commonJS({
     function isFunction(funktion) {
       return typeof funktion === "function";
     }
-    var logger2 = console.error.bind(console);
+    var logger = console.error.bind(console);
     function defineProperty(obj, name2, value) {
       var enumerable = !!obj[name2] && obj.propertyIsEnumerable(name2);
       Object.defineProperty(obj, name2, {
@@ -25433,22 +25433,22 @@ var require_shimmer = __commonJS({
     }
     function shimmer(options) {
       if (options && options.logger) {
-        if (!isFunction(options.logger)) logger2("new logger isn't a function, not replacing");
-        else logger2 = options.logger;
+        if (!isFunction(options.logger)) logger("new logger isn't a function, not replacing");
+        else logger = options.logger;
       }
     }
     function wrap(nodule, name2, wrapper) {
       if (!nodule || !nodule[name2]) {
-        logger2("no original function " + name2 + " to wrap");
+        logger("no original function " + name2 + " to wrap");
         return;
       }
       if (!wrapper) {
-        logger2("no wrapper function");
-        logger2(new Error().stack);
+        logger("no wrapper function");
+        logger(new Error().stack);
         return;
       }
       if (!isFunction(nodule[name2]) || !isFunction(wrapper)) {
-        logger2("original object and wrapper must be functions");
+        logger("original object and wrapper must be functions");
         return;
       }
       var original = nodule[name2];
@@ -25463,14 +25463,14 @@ var require_shimmer = __commonJS({
     }
     function massWrap(nodules, names, wrapper) {
       if (!nodules) {
-        logger2("must provide one or more modules to patch");
-        logger2(new Error().stack);
+        logger("must provide one or more modules to patch");
+        logger(new Error().stack);
         return;
       } else if (!Array.isArray(nodules)) {
         nodules = [nodules];
       }
       if (!(names && Array.isArray(names))) {
-        logger2("must provide one or more functions to wrap on modules");
+        logger("must provide one or more functions to wrap on modules");
         return;
       }
       nodules.forEach(function(nodule) {
@@ -25481,26 +25481,26 @@ var require_shimmer = __commonJS({
     }
     function unwrap(nodule, name2) {
       if (!nodule || !nodule[name2]) {
-        logger2("no function to unwrap.");
-        logger2(new Error().stack);
+        logger("no function to unwrap.");
+        logger(new Error().stack);
         return;
       }
       if (!nodule[name2].__unwrap) {
-        logger2("no original to unwrap to -- has " + name2 + " already been unwrapped?");
+        logger("no original to unwrap to -- has " + name2 + " already been unwrapped?");
       } else {
         return nodule[name2].__unwrap();
       }
     }
     function massUnwrap(nodules, names) {
       if (!nodules) {
-        logger2("must provide one or more modules to patch");
-        logger2(new Error().stack);
+        logger("must provide one or more modules to patch");
+        logger(new Error().stack);
         return;
       } else if (!Array.isArray(nodules)) {
         nodules = [nodules];
       }
       if (!(names && Array.isArray(names))) {
-        logger2("must provide one or more functions to unwrap on modules");
+        logger("must provide one or more functions to unwrap on modules");
         return;
       }
       nodules.forEach(function(nodule) {
@@ -39342,12 +39342,12 @@ var require_logging = __commonJS({
         break;
       default:
     }
-    var getLogger = () => {
+    var getLogger2 = () => {
       return _logger;
     };
-    exports2.getLogger = getLogger;
-    var setLogger = (logger2) => {
-      _logger = logger2;
+    exports2.getLogger = getLogger2;
+    var setLogger = (logger) => {
+      _logger = logger;
     };
     exports2.setLogger = setLogger;
     var setLoggerVerbosity = (verbosity) => {
@@ -45546,7 +45546,24 @@ var require_parse = __commonJS({
           else
             target.push([start = parseId(next()), skip("to", true) ? parseId(next()) : start]);
         } while (skip(",", true));
-        skip(";");
+        var dummy = { options: void 0 };
+        dummy.setOption = function(name2, value) {
+          if (this.options === void 0) this.options = {};
+          this.options[name2] = value;
+        };
+        ifBlock(
+          dummy,
+          function parseRange_block(token3) {
+            if (token3 === "option") {
+              parseOption(dummy, token3);
+              skip(";");
+            } else
+              throw illegal(token3);
+          },
+          function parseRange_line() {
+            parseInlineOptions(dummy);
+          }
+        );
       }
       function parseNumber(token2, insideTryCatch) {
         var sign = 1;
@@ -56753,8 +56770,8 @@ var require_src31 = __commonJS({
       throw new Error("Not available in this library. Use @grpc/proto-loader and loadPackageDefinition instead");
     };
     exports2.load = load;
-    var setLogger = (logger2) => {
-      logging.setLogger(logger2);
+    var setLogger = (logger) => {
+      logging.setLogger(logger);
     };
     exports2.setLogger = setLogger;
     var setLogVerbosity = (verbosity) => {
@@ -67365,10 +67382,10 @@ var import_resources = __toESM(require_src5(), 1);
 var import_sdk_node = __toESM(require_src36(), 1);
 var import_sdk_trace_node = __toESM(require_src20(), 1);
 var import_semantic_conventions = __toESM(require_src(), 1);
-import { logger } from "../systemlog.cjs";
+import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-NUPTPA44.js");
+} = await import("../../esm-chunks/package-7AUBRXLQ.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,
@@ -67386,7 +67403,7 @@ process.on("SIGTERM", () => {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     () => {
     },
-    (error) => logger.withError(error).log("Error shutting down OpenTelemetry NodeSDK")
+    (error) => getLogger().withError(error).log("Error shutting down OpenTelemetry NodeSDK")
   ).finally(() => process.exit(0));
 });
 export {

package/edge-runtime/lib/next-request.ts

@@ -1,6 +1,12 @@
 import type { Context } from '@netlify/edge-functions'
 
-import { addBasePath, normalizeDataUrl, normalizeLocalePath, removeBasePath } from './util.ts'
+import {
+  addBasePath,
+  addTrailingSlash,
+  normalizeDataUrl,
+  normalizeLocalePath,
+  removeBasePath,
+} from './util.ts'
 
 interface I18NConfig {
   defaultLocale: string
@@ -41,43 +47,25 @@ const normalizeRequestURL = (
 ): { url: string; detectedLocale?: string } => {
   const url = new URL(originalURL)
 
-  url.pathname = removeBasePath(url.pathname, nextConfig?.basePath)
-  const didRemoveBasePath = url.toString() !== originalURL
+  let pathname = removeBasePath(url.pathname, nextConfig?.basePath)
 
-  let detectedLocale: string | undefined
-
-  if (nextConfig?.i18n) {
-    const { pathname, detectedLocale: detected } = normalizeLocalePath(
-      url.pathname,
-      nextConfig?.i18n?.locales,
-    )
-    if (!nextConfig?.skipMiddlewareUrlNormalize) {
-      url.pathname = pathname || '/'
-    }
-    detectedLocale = detected
-  }
+  // If it exists, remove the locale from the URL and store it
+  const { detectedLocale } = normalizeLocalePath(pathname, nextConfig?.i18n?.locales)
 
   if (!nextConfig?.skipMiddlewareUrlNormalize) {
     // We want to run middleware for data requests and expose the URL of the
     // corresponding pages, so we have to normalize the URLs before running
     // the handler.
-    url.pathname = normalizeDataUrl(url.pathname)
+    pathname = normalizeDataUrl(pathname)
 
     // Normalizing the trailing slash based on the `trailingSlash` configuration
     // property from the Next.js config.
-    if (nextConfig?.trailingSlash && url.pathname !== '/' && !url.pathname.endsWith('/')) {
-      url.pathname = `${url.pathname}/`
+    if (nextConfig?.trailingSlash) {
+      pathname = addTrailingSlash(pathname)
     }
   }
 
-  if (didRemoveBasePath) {
-    url.pathname = addBasePath(url.pathname, nextConfig?.basePath)
-  }
-
-  // keep the locale in the url for request.nextUrl object
-  if (detectedLocale) {
-    url.pathname = `/${detectedLocale}${url.pathname}`
-  }
+  url.pathname = addBasePath(pathname, nextConfig?.basePath)
 
   return {
     url: url.toString(),

package/edge-runtime/lib/routing.ts

@@ -10,7 +10,7 @@ import type { Key } from '../vendor/deno.land/x/path_to_regexp@v6.2.1/index.ts'
 import { compile, pathToRegexp } from '../vendor/deno.land/x/path_to_regexp@v6.2.1/index.ts'
 import { getCookies } from '../vendor/deno.land/std@0.175.0/http/cookie.ts'
 
-/* 
+/*
   ┌─────────────────────────────────────────────────────────────────────────┐
   │ Inlined/re-implemented types                                            │
   └─────────────────────────────────────────────────────────────────────────┘
@@ -86,7 +86,7 @@ export type RoutesManifest = {
   dynamicRoutes: DynamicRoute[]
 }
 
-/* 
+/*
   ┌─────────────────────────────────────────────────────────────────────────┐
   │ packages/next/src/shared/lib/escape-regexp.ts                           │
   └─────────────────────────────────────────────────────────────────────────┘
@@ -104,7 +104,7 @@ export function escapeStringRegexp(str: string) {
   return str
 }
 
-/* 
+/*
   ┌─────────────────────────────────────────────────────────────────────────┐
   │ packages/next/src/shared/lib/router/utils/querystring.ts                │
   └─────────────────────────────────────────────────────────────────────────┘
@@ -125,7 +125,7 @@ export function searchParamsToUrlQuery(searchParams: URLSearchParams): ParsedUrl
   return query
 }
 
-/* 
+/*
   ┌─────────────────────────────────────────────────────────────────────────┐
   │ packages/next/src/shared/lib/router/utils/parse-url.ts                  │
   └─────────────────────────────────────────────────────────────────────────┘
@@ -156,7 +156,7 @@ export function parseUrl(url: string): ParsedUrl {
   }
 }
 
-/* 
+/*
   ┌─────────────────────────────────────────────────────────────────────────┐
   │ packages/next/src/shared/lib/router/utils/prepare-destination.ts        │
   │ — Changed to use WHATWG Fetch `Request` instead of                      │
@@ -392,7 +392,7 @@ function unescapeSegments(str: string) {
   return str.replace(/__ESC_COLON_/gi, ':')
 }
 
-/* 
+/*
   ┌─────────────────────────────────────────────────────────────────────────┐
   │ packages/next/src/shared/lib/router/utils/is-dynamic.ts                 │
   └─────────────────────────────────────────────────────────────────────────┘
@@ -404,7 +404,7 @@ export function isDynamicRoute(route: string): boolean {
   return TEST_ROUTE.test(route)
 }
 
-/* 
+/*
   ┌─────────────────────────────────────────────────────────────────────────┐
   │ packages/next/shared/lib/router/utils/middleware-route-matcher.ts       │
   └─────────────────────────────────────────────────────────────────────────┘

package/edge-runtime/middleware.ts

@@ -1,7 +1,7 @@
 import type { Context } from '@netlify/edge-functions'
 
-import matchers from './matchers.json' assert { type: 'json' }
-import nextConfig from './next.config.json' assert { type: 'json' }
+import matchers from './matchers.json' with { type: 'json' }
+import nextConfig from './next.config.json' with { type: 'json' }
 
 import { InternalHeaders } from './lib/headers.ts'
 import { logger, LogLevel } from './lib/logging.ts'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",
@@ -14,7 +14,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/netlify/next-runtime-minimal.git"
+    "url": "git+https://github.com/netlify/next-runtime.git"
   },
   "keywords": [
     "nextjs",
@@ -24,7 +24,7 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/netlify/next-runtime-minimal/issues"
+    "url": "https://github.com/netlify/next-runtime/issues"
   },
-  "homepage": "https://github.com/netlify/next-runtime-minimal#readme"
+  "homepage": "https://github.com/netlify/next-runtime#readme"
 }

package/dist/run/systemlog.cjs

@@ -1,98 +0,0 @@
-"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
-});