@netlify/plugin-nextjs 5.4.0-canary-perf-debug.0 → 5.5.0

package/dist/run/headers.js

@@ -51,11 +51,6 @@ var omitHeaderValues = (header, values) => {
   );
   return filteredValues.join(", ");
 };
-var mapHeaderValues = (header, callback) => {
-  const headerValues = getHeaderValueArray(header);
-  const mappedValues = headerValues.map(callback);
-  return mappedValues.join(", ");
-};
 var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   const netlifyVaryValues = {
     header: ["x-nextjs-data", "x-next-debug-logging"],
@@ -147,11 +142,12 @@ var adjustDateHeader = async ({
   headers.set("x-nextjs-date", headers.get("date") ?? lastModifiedDate.toUTCString());
   headers.set("date", lastModifiedDate.toUTCString());
 };
-var setCacheControlHeaders = (headers, request, requestContext) => {
+var setCacheControlHeaders = (headers, request, requestContext, useDurableCache) => {
+  const durableCacheDirective = useDurableCache ? ", durable" : "";
   if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
     const cdnCacheControl = (
       // if we are serving already stale response, instruct edge to not attempt to cache that response
-      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000`
+      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000${durableCacheDirective}`
     );
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
@@ -164,10 +160,12 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
     ]);
     const cdnCacheControl = (
       // if we are serving already stale response, instruct edge to not attempt to cache that response
-      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : mapHeaderValues(
-        cacheControl,
-        (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
-      )
+      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : [
+        ...getHeaderValueArray(cacheControl).map(
+          (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
+        ),
+        ...useDurableCache ? ["durable"] : []
+      ].join(", ")
     );
     headers.set("cache-control", browserCacheControl || "public, max-age=0, must-revalidate");
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
@@ -175,17 +173,12 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
   }
   if (cacheControl === null && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control") && requestContext.usedFsRead) {
     headers.set("cache-control", "public, max-age=0, must-revalidate");
-    headers.set("netlify-cdn-cache-control", `max-age=31536000`);
+    headers.set("netlify-cdn-cache-control", `max-age=31536000${durableCacheDirective}`);
   }
 };
-function getCanonicalPathFromCacheKey(cacheKey) {
-  return cacheKey === "/index" ? "/" : cacheKey;
-}
-var setCacheTagsHeaders = (headers, request, manifest, requestContext) => {
-  const path = getCanonicalPathFromCacheKey(requestContext.responseCacheKey) ?? new URL(request.url).pathname;
-  const tags = manifest[path];
-  if (tags !== void 0) {
-    headers.set("netlify-cache-tag", tags);
+var setCacheTagsHeaders = (headers, requestContext) => {
+  if (requestContext.responseCacheTags) {
+    headers.set("netlify-cache-tag", requestContext.responseCacheTags.join(","));
   }
 };
 var NEXT_CACHE_TO_CACHE_STATUS = {

package/dist/run/next.cjs

@@ -553,9 +553,7 @@ async function getMockedRequestHandlers(...args) {
         if (typeof path === "string" && path.endsWith(".html")) {
           const store = (0, import_regional_blob_store.getRegionalBlobStore)();
           const relPath = (0, import_path.relative)((0, import_path.resolve)(".next/server/pages"), path);
-          const file = await (0, import_tracer.getTracer)().withActiveSpan(`blob readFile ${relPath}`, async () => {
-            return await store.get(await encodeBlobKey(relPath));
-          });
+          const file = await store.get(await encodeBlobKey(relPath));
           if (file !== null) {
             const requestContext = (0, import_request_context.getRequestContext)();
             if (requestContext) {

package/dist/run/revalidate.js

@@ -7,15 +7,22 @@
 import "../esm-chunks/chunk-OEQOKJGE.js";
 
 // src/run/revalidate.ts
+import { isPromise } from "node:util/types";
+function isRevalidateMethod(key, nextResponseField) {
+  return key === "revalidate" && typeof nextResponseField === "function";
+}
 var nextResponseProxy = (res, requestContext) => {
   return new Proxy(res, {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     get(target, key) {
-      const originalValue = target[key];
-      if (key === "revalidate") {
-        return async function newRevalidate(...args) {
+      const originalValue = Reflect.get(target, key);
+      if (isRevalidateMethod(key, originalValue)) {
+        return function newRevalidate(...args) {
           requestContext.didPagesRouterOnDemandRevalidate = true;
-          return originalValue?.apply(target, args);
+          const result = originalValue.apply(target, args);
+          if (result && isPromise(result)) {
+            requestContext.trackBackgroundWork(result);
+          }
+          return result;
         };
       }
       return originalValue;

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

@@ -1,6 +1,12 @@
 import type { Context } from '@netlify/edge-functions'
 
-import { normalizeDataUrl, removeBasePath, normalizeLocalePath, addBasePath } from './util.ts'
+import {
+  addBasePath,
+  addTrailingSlash,
+  normalizeDataUrl,
+  normalizeLocalePath,
+  removeBasePath,
+} from './util.ts'
 
 interface I18NConfig {
   defaultLocale: string
@@ -41,38 +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)
-  }
+  url.pathname = addBasePath(pathname, nextConfig?.basePath)
 
   return {
     url: url.toString(),
@@ -88,9 +81,9 @@ export const buildNextRequest = (
   const { url, method, body, headers } = request
   const { country, subdivision, city, latitude, longitude, timezone } = context.geo
   const geo: RequestData['geo'] = {
+    city,
     country: country?.code,
     region: subdivision?.code,
-    city,
     latitude: latitude?.toString(),
     longitude: longitude?.toString(),
     timezone,

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/lib/util.ts

@@ -1,5 +1,3 @@
-import type { RequestData } from './next-request.ts'
-
 /**
  * Normalize a data URL into a route path.
  * @see https://github.com/vercel/next.js/blob/25e0988e7c9033cb1503cbe0c62ba5de2e97849c/packages/next/src/shared/lib/router/utils/get-next-pathname-info.ts#L69-L76

package/edge-runtime/middleware.ts

@@ -1,17 +1,16 @@
 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'
 import { buildNextRequest, RequestData } from './lib/next-request.ts'
-import { buildResponse } from './lib/response.ts'
-import { FetchEventResult } from './lib/response.ts'
+import { buildResponse, FetchEventResult } from './lib/response.ts'
 import {
-  type MiddlewareRouteMatch,
   getMiddlewareRouteMatcher,
   searchParamsToUrlQuery,
+  type MiddlewareRouteMatch,
 } from './lib/routing.ts'
 
 type NextHandler = (params: { request: RequestData }) => Promise<FetchEventResult>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.4.0-canary-perf-debug.0",
+  "version": "5.5.0",
   "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/handlers/import-time-debug.cjs

@@ -1,53 +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/handlers/import-time-debug.cts
-var import_time_debug_exports = {};
-__export(import_time_debug_exports, {
-  enableModuleImportTracing: () => enableModuleImportTracing
-});
-module.exports = __toCommonJS(import_time_debug_exports);
-var import_path = require("path");
-var import_tracer = require("./tracer.cjs");
-function enableModuleImportTracing() {
-  const cwd = process.cwd();
-  const extension = ".js";
-  const original = require.extensions[extension];
-  if (!original) {
-    return;
-  }
-  require.extensions[extension] = function patchedExtensions(module2, filename) {
-    const startTime = Date.now();
-    const ret = original(module2, filename);
-    const durationMS = Date.now() - startTime;
-    if (durationMS > 50) {
-      (0, import_tracer.getTracer)().withActiveSpan(
-        `module import ${(0, import_path.relative)(cwd, module2.filename)}`,
-        { startTime },
-        () => {
-        }
-      );
-    }
-    return ret;
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  enableModuleImportTracing
-});

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
-});