@netlify/plugin-nextjs 5.0.0-rc.8 → 5.1.0

package/README.md

@@ -1,105 +1,18 @@
-# Next.js Runtime
-
-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.
-
-## Lambda Folder structure:
-
-For a simple next.js app
-
-```
-/___netlify-server-handler
-├── .netlify
-│   ├── tags-manifest.json
-│   └── dist // the compiled runtime code
-│       └── run
-│           ├── handlers
-│           │   ├── server.js
-│           │   └── cache.cjs
-│           └── next.cjs
-├── .next // or distDir name from the next.config.js
-│   └── // content from standalone
-├── run-config.json // the config object from the required-server-files.json
-├── node_modules
-├── ___netlify-server-handler.json
-├── ___netlify-server-handler.mjs
-└── package.json
-```
-
-## Testing
-
-The repo includes two types of tests: e2e tests in the repo that use Playwright, integration tests
-that use Vitest.
-
-By default the e2e and integration tests run against the latest version of Next.js. To run tests
-against a specific version, set the `NEXT_VERSION` environment variable to the desired version.
-
-By default, PRs will run the integration tests against the latest version of Next.js. To run tests
-against `latest`, `canary` and `13.5.1`, apply the `test all versions` label to the PR when you
-create it. These also run nightly and on release PRs.
-
-### Integration testing
-
-> **Prerequisite** Run `npm run build` before running integration tests.
-
-How to add new integration test scenarios to the application:
-
-1. Create a new folder under `tests/fixtures/<your-name>`
-2. Adapt the `next.config.js` to be a standalone application
-3. Create a `postinstall` script that runs the `next build`. It's important to notice that the
-   integration tests rely on a already built next.js application in this folder. They rely on the
-   `.next` folder.
-4. Add your test
-
-> Currently the tests require a built version of the `dist/run/handlers/cache.cjs` so you need to
-> run `npm run build` before executing the integration tests.
-
-In addition, the integration tests need to be prepared before first use. You can do this by running
-`npm run pretest`. To speed up this process and build only the fixtures whose name starts with a
-given prefix, run `npm run pretest -- <prefix>`.
-
-### E2E testing
-
-> **Prerequisite**
->
-> Needs the `netlify-cli` installed and being logged in having access to Netlify Testing
-> Organization
-
-The e2e tests can be invoked with `npm run e2e` and perform a full e2e test. This means they do the
-following:
-
-1. Building the next-runtime (just running `npm run build` in the repository)
-2. Creating a temp directory and copying the provided fixture over to the directory.
-3. Packing the runtime with `npm pack` to the temp directory.
-4. Installing the runtime from the created zip artifact of `npm pack` (this is like installing a
-   node_module from the registry)
-5. Creating a `netlify.toml` inside the temp directory of the fixture and adding the runtime as a
-   plugin.
-6. Running `netlify deploy --build` invoking the runtime. This will use the
-   [next-runtime-testing](https://app.netlify.com/sites/next-runtime-testing/overview) as site to
-   deploy to.
-7. Using the `deployId` and `url` of the deployed site to run some
-   [playwright](https://playwright.dev/) tests against, asserting the correctness of the runtime.
-8. After the tests where run successfully, it will delete the deployment again and clean everything
-   up. In case of a failure, the deploy won't be cleaned up to leave it for troubleshooting
-   purposes.
-
-> [!TIP] If you'd like to always keep the deployment and the local fixture around for
-> troubleshooting, run `E2E_PERSIST=1 npm run e2e`.
-
-### Next.js tests
-
-There is a script `run-local-test.sh` and GitHub workflow that runs the e2e tests from the Next.js
-repo against this repo. It requires that `next.js` is checked out in the same parent directory as
-this repo, and is run from this repo with `./run-local-test.sh your-test-pattern-here`.
-
-#### cleanup old deploys
-
-To cleanup old and dangling deploys from failed builds you can run the following script:
-
-```bash
-npx tsx ./tools/e2e/cleanup-deploys.ts
-```
-
-This will cleanup all created deploys on the
-[next-runtime-testing](https://app.netlify.com/sites/next-runtime-testing/overview) site.
+![Next.js Runtime](https://github.com/netlify/next-runtime/raw/main/next-js-runtime.png)
+
+# `@netlify/plugin-nextjs`
+
+<p align="center">
+  <a aria-label="npm version" href="https://www.npmjs.com/package/@netlify/plugin-nextjs">
+    <img alt="" src="https://img.shields.io/npm/v/@netlify/plugin-nextjs">
+  </a>
+  <a aria-label="MIT License" href="https://img.shields.io/npm/l/@netlify/plugin-nextjs">
+    <img alt="" src="https://img.shields.io/npm/l/@netlify/plugin-nextjs">
+  </a>
+</p>
+
+This package handles the build process and creates the runtime environment for Next.js sites on
+Netlify. You should not normally need to install it yourself, as it is used automatically during
+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.

package/dist/build/advanced-api-routes.js

@@ -0,0 +1,15 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+import {
+  ApiRouteType,
+  getAPIRoutesConfigs
+} from "../esm-chunks/chunk-BG455SFE.js";
+import "../esm-chunks/chunk-5JVNISGM.js";
+export {
+  ApiRouteType,
+  getAPIRoutesConfigs
+};

package/dist/build/content/prerendered.js

@@ -7,11 +7,11 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-4635LKT6.js";
+} from "../../esm-chunks/chunk-MRD3XSKD.js";
+import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-PDPDW32D.js";
 import "../../esm-chunks/chunk-Y3K5Q6FP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   copyFetchContent,

package/dist/build/content/server.js

@@ -10,12 +10,13 @@ import {
   getPatchesToApply,
   verifyHandlerDirStructure,
   writeTagsManifest
-} from "../../esm-chunks/chunk-YSGPGDIG.js";
+} from "../../esm-chunks/chunk-ZKJEJNSJ.js";
 import "../../esm-chunks/chunk-PDPDW32D.js";
 import "../../esm-chunks/chunk-Y3K5Q6FP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-MGPEWDDD.js";
+import "../../esm-chunks/chunk-PH26UF2W.js";
 import "../../esm-chunks/chunk-PJG75HGC.js";
+import "../../esm-chunks/chunk-BG455SFE.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {

package/dist/build/content/static.js

@@ -10,11 +10,11 @@ import {
   copyStaticExport,
   publishStaticDir,
   unpublishStaticDir
-} from "../../esm-chunks/chunk-GV3YIJ33.js";
+} from "../../esm-chunks/chunk-74THQNRG.js";
+import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-PDPDW32D.js";
 import "../../esm-chunks/chunk-Y3K5Q6FP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   copyStaticAssets,

package/dist/build/functions/server.js

@@ -6,14 +6,15 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-757FQQND.js";
-import "../../esm-chunks/chunk-YSGPGDIG.js";
+} from "../../esm-chunks/chunk-F5VQRN6L.js";
+import "../../esm-chunks/chunk-ZKJEJNSJ.js";
 import "../../esm-chunks/chunk-PDPDW32D.js";
 import "../../esm-chunks/chunk-Y3K5Q6FP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-3NYX5FXN.js";
-import "../../esm-chunks/chunk-MGPEWDDD.js";
+import "../../esm-chunks/chunk-PH26UF2W.js";
 import "../../esm-chunks/chunk-PJG75HGC.js";
+import "../../esm-chunks/chunk-BG455SFE.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {

package/dist/build/verification.js

@@ -7,12 +7,15 @@
 import {
   verifyBuildConfig,
   verifyNextVersion,
+  verifyNoAdvancedAPIRoutes,
   verifyPublishDir
-} from "../esm-chunks/chunk-MGPEWDDD.js";
+} from "../esm-chunks/chunk-PH26UF2W.js";
 import "../esm-chunks/chunk-PJG75HGC.js";
+import "../esm-chunks/chunk-BG455SFE.js";
 import "../esm-chunks/chunk-5JVNISGM.js";
 export {
   verifyBuildConfig,
   verifyNextVersion,
+  verifyNoAdvancedAPIRoutes,
   verifyPublishDir
 };

package/dist/esm-chunks/{chunk-M2ZKGJAI.js → chunk-57DK2TJ7.js}

@@ -647,6 +647,14 @@ var adjustDateHeader = async ({
   headers.set("date", lastModifiedDate.toUTCString());
 };
 var setCacheControlHeaders = (headers, request, requestContext) => {
+  if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && !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.set("netlify-cdn-cache-control", cdnCacheControl);
+    return;
+  }
   const cacheControl = headers.get("cache-control");
   if (cacheControl !== null && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
     const browserCacheControl = omitHeaderValues(cacheControl, [
@@ -662,6 +670,7 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
     );
     headers.set("cache-control", browserCacheControl || "public, max-age=0, must-revalidate");
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
+    return;
   }
   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");

package/dist/esm-chunks/chunk-BG455SFE.js

@@ -0,0 +1,133 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+import {
+  __require
+} from "./chunk-5JVNISGM.js";
+
+// src/build/advanced-api-routes.ts
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+var ApiRouteType = /* @__PURE__ */ ((ApiRouteType2) => {
+  ApiRouteType2["SCHEDULED"] = "experimental-scheduled";
+  ApiRouteType2["BACKGROUND"] = "experimental-background";
+  return ApiRouteType2;
+})(ApiRouteType || {});
+async function getAPIRoutesConfigs(ctx) {
+  const functionsConfigManifestPath = join(
+    ctx.publishDir,
+    "server",
+    "functions-config-manifest.json"
+  );
+  if (!existsSync(functionsConfigManifestPath)) {
+    return [];
+  }
+  const functionsConfigManifest = JSON.parse(
+    await readFile(functionsConfigManifestPath, "utf-8")
+  );
+  const appDir = ctx.resolveFromSiteDir(".");
+  const pagesDir = join(appDir, "pages");
+  const srcPagesDir = join(appDir, "src", "pages");
+  const { pageExtensions } = ctx.requiredServerFiles.config;
+  return Promise.all(
+    Object.keys(functionsConfigManifest.functions).map(async (apiRoute) => {
+      const filePath = getSourceFileForPage(apiRoute, [pagesDir, srcPagesDir], pageExtensions);
+      const sharedFields = {
+        apiRoute,
+        filePath,
+        config: {}
+      };
+      if (filePath) {
+        const config = await extractConfigFromFile(filePath, appDir);
+        return {
+          ...sharedFields,
+          config
+        };
+      }
+      return sharedFields;
+    })
+  );
+}
+var SOURCE_FILE_EXTENSIONS = ["js", "jsx", "ts", "tsx"];
+var getSourceFileForPage = (page, roots, pageExtensions = SOURCE_FILE_EXTENSIONS) => {
+  for (const root of roots) {
+    for (const extension of pageExtensions) {
+      const file = join(root, `${page}.${extension}`);
+      if (existsSync(file)) {
+        return file;
+      }
+      const fileAtFolderIndex = join(root, page, `index.${extension}`);
+      if (existsSync(fileAtFolderIndex)) {
+        return fileAtFolderIndex;
+      }
+    }
+  }
+};
+var findModuleFromBase = ({
+  paths,
+  candidates
+}) => {
+  for (const candidate of candidates) {
+    try {
+      const modulePath = __require.resolve(candidate, { paths });
+      if (modulePath) {
+        return modulePath;
+      }
+    } catch {
+    }
+  }
+  for (const candidate of candidates) {
+    try {
+      const modulePath = __require.resolve(candidate);
+      if (modulePath) {
+        return modulePath;
+      }
+    } catch {
+    }
+  }
+  return null;
+};
+var extractConstValue;
+var parseModule;
+var extractConfigFromFile = async (apiFilePath, appDir) => {
+  if (!apiFilePath || !existsSync(apiFilePath)) {
+    return {};
+  }
+  const extractConstValueModulePath = findModuleFromBase({
+    paths: [appDir],
+    candidates: ["next/dist/build/analysis/extract-const-value"]
+  });
+  const parseModulePath = findModuleFromBase({
+    paths: [appDir],
+    candidates: ["next/dist/build/analysis/parse-module"]
+  });
+  if (!extractConstValueModulePath || !parseModulePath) {
+    return {};
+  }
+  if (!extractConstValue && extractConstValueModulePath) {
+    extractConstValue = __require(extractConstValueModulePath);
+  }
+  if (!parseModule && parseModulePath) {
+    parseModule = __require(parseModulePath).parseModule;
+  }
+  const { extractExportedConstValue } = extractConstValue;
+  const fileContent = await readFile(apiFilePath, "utf8");
+  if (!fileContent.includes("config")) {
+    return {};
+  }
+  const ast = await parseModule(apiFilePath, fileContent);
+  try {
+    return extractExportedConstValue(ast, "config");
+  } catch {
+    return {};
+  }
+};
+
+export {
+  ApiRouteType,
+  getAPIRoutesConfigs
+};

package/dist/esm-chunks/{chunk-757FQQND.js → chunk-F5VQRN6L.js}

@@ -9,7 +9,7 @@ import {
   copyNextServerCode,
   verifyHandlerDirStructure,
   writeTagsManifest
-} from "./chunk-YSGPGDIG.js";
+} from "./chunk-ZKJEJNSJ.js";
 import {
   wrapTracer
 } from "./chunk-PDPDW32D.js";

package/dist/esm-chunks/{chunk-4635LKT6.js → chunk-MRD3XSKD.js}

@@ -4,6 +4,9 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  encodeBlobKey
+} from "./chunk-TYCYFZ22.js";
 import {
   wrapTracer
 } from "./chunk-PDPDW32D.js";
@@ -14,9 +17,6 @@ import {
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
-import {
-  encodeBlobKey
-} from "./chunk-TYCYFZ22.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";
@@ -165,10 +165,11 @@ var buildAppCacheValue = async (path) => {
     ...meta
   };
 };
-var buildRouteCacheValue = async (path) => ({
+var buildRouteCacheValue = async (path, initialRevalidateSeconds) => ({
   kind: "ROUTE",
   body: await readFile(`${path}.body`, "base64"),
-  ...JSON.parse(await readFile(`${path}.meta`, "utf-8"))
+  ...JSON.parse(await readFile(`${path}.meta`, "utf-8")),
+  revalidate: initialRevalidateSeconds
 });
 var buildFetchCacheValue = async (path) => ({
   kind: "FETCH",
@@ -199,7 +200,10 @@ var copyPrerenderedContent = async (ctx) => {
                 value = await buildAppCacheValue(join(ctx.publishDir, "server/app", key));
                 break;
               case meta.dataRoute === null:
-                value = await buildRouteCacheValue(join(ctx.publishDir, "server/app", key));
+                value = await buildRouteCacheValue(
+                  join(ctx.publishDir, "server/app", key),
+                  meta.initialRevalidateSeconds
+                );
                 break;
               default:
                 throw new Error(`Unrecognized content: ${route}`);

package/dist/esm-chunks/{chunk-MGPEWDDD.js → chunk-PH26UF2W.js}

@@ -7,6 +7,9 @@
 import {
   require_semver
 } from "./chunk-PJG75HGC.js";
+import {
+  getAPIRoutesConfigs
+} from "./chunk-BG455SFE.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";
@@ -60,9 +63,24 @@ function verifyBuildConfig(ctx) {
     );
   }
 }
+async function verifyNoAdvancedAPIRoutes(ctx) {
+  const apiRoutesConfigs = await getAPIRoutesConfigs(ctx);
+  const unsupportedAPIRoutes = apiRoutesConfigs.filter((apiRouteConfig) => {
+    return apiRouteConfig.config.type === "experimental-background" /* BACKGROUND */ || apiRouteConfig.config.type === "experimental-scheduled" /* SCHEDULED */;
+  });
+  if (unsupportedAPIRoutes.length !== 0) {
+    ctx.failBuild(
+      `@netlify/plugin-next@5 does not support advanced API routes. The following API routes should be migrated to Netlify background or scheduled functions:
+${unsupportedAPIRoutes.map((apiRouteConfig) => ` - ${apiRouteConfig.apiRoute} (type: "${apiRouteConfig.config.type}")`).join("\n")}
+
+Refer to https://ntl.fyi/next-scheduled-bg-function-migration as migration example.`
+    );
+  }
+}
 
 export {
   verifyPublishDir,
   verifyNextVersion,
-  verifyBuildConfig
+  verifyBuildConfig,
+  verifyNoAdvancedAPIRoutes
 };

package/dist/esm-chunks/{chunk-YSGPGDIG.js → chunk-ZKJEJNSJ.js}

@@ -16,7 +16,7 @@ import {
 } from "./chunk-VZNKO4OO.js";
 import {
   verifyNextVersion
-} from "./chunk-MGPEWDDD.js";
+} from "./chunk-PH26UF2W.js";
 import {
   require_semver
 } from "./chunk-PJG75HGC.js";

package/dist/esm-chunks/{package-NFGYFGF2.js → package-RGWYJEMK.js}

@@ -8,7 +8,7 @@ import "./chunk-5JVNISGM.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.0.0-rc.8";
+var version = "5.1.0";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -23,17 +23,22 @@ var engines = {
 var scripts = {
   prepack: "clean-package",
   postpack: "clean-package restore",
-  pretest: "npm run build && node tests/prepare.mjs",
+  pretest: "npm run pretest:integration",
+  "pretest:integration": "npm run build && node tests/prepare.mjs",
   build: "node ./tools/build.js",
   "build:watch": "node ./tools/build.js --watch",
   lint: "eslint --cache --format=codeframe --max-warnings=0 --ext .ts,.cts,.js src",
   "format:fix": "prettier --write .",
   "format:check": "prettier --check .",
   test: "vitest",
-  "test:ci": "vitest run --reporter=default --retry=3",
-  typecheck: "tsc --noEmit",
-  e2e: "playwright test",
-  "e2e:ci": "playwright test"
+  "test:unit": "vitest run --project unit",
+  "test:integration": "vitest run --project integration",
+  "test:smoke": "vitest run --project smoke",
+  "test:e2e": "playwright test",
+  "test:ci:unit-and-integration": "vitest run --reporter=default --retry=3 --project=unit --project=integration",
+  "test:ci:smoke": "vitest run --reporter=default --retry=3 --project=smoke",
+  "test:ci:e2e": "playwright test",
+  typecheck: "tsc --noEmit"
 };
 var repository = {
   type: "git",
@@ -93,7 +98,7 @@ var devDependencies = {
   typescript: "^5.1.6",
   unionfs: "^4.5.1",
   uuid: "^9.0.1",
-  vitest: "^1.2.2"
+  vitest: "^1.4.0"
 };
 var clean_package = {
   indent: 2,

package/dist/index.js

@@ -4,23 +4,21 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  createServerHandler
+} from "./esm-chunks/chunk-F5VQRN6L.js";
 import {
   copyPrerenderedContent
-} from "./esm-chunks/chunk-4635LKT6.js";
+} from "./esm-chunks/chunk-MRD3XSKD.js";
+import "./esm-chunks/chunk-ZKJEJNSJ.js";
 import {
   copyStaticAssets,
   copyStaticContent,
   copyStaticExport,
   publishStaticDir,
   unpublishStaticDir
-} from "./esm-chunks/chunk-GV3YIJ33.js";
-import {
-  createEdgeHandlers
-} from "./esm-chunks/chunk-OBKVBMAL.js";
-import {
-  createServerHandler
-} from "./esm-chunks/chunk-757FQQND.js";
-import "./esm-chunks/chunk-YSGPGDIG.js";
+} from "./esm-chunks/chunk-74THQNRG.js";
+import "./esm-chunks/chunk-TYCYFZ22.js";
 import {
   wrapTracer
 } from "./esm-chunks/chunk-PDPDW32D.js";
@@ -28,6 +26,9 @@ import {
   init_esm,
   trace
 } from "./esm-chunks/chunk-Y3K5Q6FP.js";
+import {
+  createEdgeHandlers
+} from "./esm-chunks/chunk-OBKVBMAL.js";
 import "./esm-chunks/chunk-VZNKO4OO.js";
 import {
   restoreBuildCache,
@@ -41,11 +42,12 @@ import {
 } from "./esm-chunks/chunk-3NYX5FXN.js";
 import {
   verifyBuildConfig,
+  verifyNoAdvancedAPIRoutes,
   verifyPublishDir
-} from "./esm-chunks/chunk-MGPEWDDD.js";
+} from "./esm-chunks/chunk-PH26UF2W.js";
 import "./esm-chunks/chunk-PJG75HGC.js";
+import "./esm-chunks/chunk-BG455SFE.js";
 import "./esm-chunks/chunk-UYKENJEU.js";
-import "./esm-chunks/chunk-TYCYFZ22.js";
 import "./esm-chunks/chunk-5JVNISGM.js";
 
 // src/index.ts
@@ -71,6 +73,7 @@ var onBuild = async (options) => {
     if (ctx.buildConfig.output === "export") {
       return copyStaticExport(ctx);
     }
+    await verifyNoAdvancedAPIRoutes(ctx);
     await Promise.all([
       copyStaticAssets(ctx),
       copyStaticContent(ctx),

package/dist/run/handlers/cache.cjs

@@ -868,6 +868,14 @@ var NetlifyCacheHandler = class {
       requestContext.responseCacheGetLastModified = cacheValue.lastModified;
     }
   }
+  captureRouteRevalidateAndRemoveFromObject(cacheValue) {
+    const { revalidate, ...restOfRouteValue } = cacheValue;
+    const requestContext = (0, import_request_context.getRequestContext)();
+    if (requestContext) {
+      requestContext.routeHandlerRevalidate = revalidate;
+    }
+    return restOfRouteValue;
+  }
   async get(...args) {
     return this.tracer.withActiveSpan("get cache key", async (span) => {
       const [key, ctx = {}] = args;
@@ -897,15 +905,17 @@ var NetlifyCacheHandler = class {
             lastModified: blob.lastModified,
             value: blob.value
           };
-        case "ROUTE":
+        case "ROUTE": {
           span.addEvent("ROUTE", { lastModified: blob.lastModified, status: blob.value.status });
+          const valueWithoutRevalidate = this.captureRouteRevalidateAndRemoveFromObject(blob.value);
           return {
             lastModified: blob.lastModified,
             value: {
-              ...blob.value,
-              body: import_node_buffer2.Buffer.from(blob.value.body, "base64")
+              ...valueWithoutRevalidate,
+              body: import_node_buffer2.Buffer.from(valueWithoutRevalidate.body, "base64")
             }
           };
+        }
         case "PAGE":
           span.addEvent("PAGE", { lastModified: blob.lastModified });
           return {
@@ -920,19 +930,19 @@ var NetlifyCacheHandler = class {
   }
   async set(...args) {
     return this.tracer.withActiveSpan("set cache key", async (span) => {
-      const [key, data] = args;
+      const [key, data, context] = args;
       const blobKey = await this.encodeBlobKey(key);
       const lastModified = Date.now();
       span.setAttributes({ key, lastModified, blobKey });
       console.debug(`[NetlifyCacheHandler.set]: ${key}`);
-      let value = data;
-      if (data?.kind === "ROUTE") {
-        value = {
+      const value = data?.kind === "ROUTE" ? (
+        // don't mutate data, as it's used for the initial response - instead create a new object
+        {
           ...data,
-          // @ts-expect-error gotta find a better solution for this
+          revalidate: context.revalidate,
           body: data.body.toString("base64")
-        };
-      }
+        }
+      ) : data;
       await this.blobStore.setJSON(blobKey, {
         lastModified,
         value

package/dist/run/handlers/server.js

@@ -4,24 +4,24 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  adjustDateHeader,
+  setCacheControlHeaders,
+  setCacheStatusHeader,
+  setCacheTagsHeaders,
+  setVaryHeaders
+} from "../../esm-chunks/chunk-57DK2TJ7.js";
 import {
   nextResponseProxy
 } from "../../esm-chunks/chunk-RL4K4CVH.js";
 import {
   import_internal
 } from "../../esm-chunks/chunk-HYBEXB2Z.js";
+import "../../esm-chunks/chunk-TYCYFZ22.js";
 import {
   getTagsManifest
 } from "../../esm-chunks/chunk-3SUDZQ7L.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";
-import {
-  adjustDateHeader,
-  setCacheControlHeaders,
-  setCacheStatusHeader,
-  setCacheTagsHeaders,
-  setVaryHeaders
-} from "../../esm-chunks/chunk-M2ZKGJAI.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
 import {
   __commonJS,
   __toESM

package/dist/run/handlers/tracing.js

@@ -51202,7 +51202,7 @@ var import_sdk_trace_node = __toESM(require_src14(), 1);
 var import_semantic_conventions = __toESM(require_src(), 1);
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-NFGYFGF2.js");
+} = await import("../../esm-chunks/package-RGWYJEMK.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

@@ -10,7 +10,7 @@ import {
   setCacheStatusHeader,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../esm-chunks/chunk-M2ZKGJAI.js";
+} from "../esm-chunks/chunk-57DK2TJ7.js";
 import "../esm-chunks/chunk-TYCYFZ22.js";
 import "../esm-chunks/chunk-5JVNISGM.js";
 export {

package/dist/shared/cache-types.cjs

@@ -0,0 +1,18 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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/shared/cache-types.cts
+var cache_types_exports = {};
+module.exports = __toCommonJS(cache_types_exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.0.0-rc.8",
+  "version": "5.1.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",

package/dist/esm-chunks/{chunk-GV3YIJ33.js → chunk-74THQNRG.js}

@@ -4,6 +4,9 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  encodeBlobKey
+} from "./chunk-TYCYFZ22.js";
 import {
   wrapTracer
 } from "./chunk-PDPDW32D.js";
@@ -14,9 +17,6 @@ import {
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
-import {
-  encodeBlobKey
-} from "./chunk-TYCYFZ22.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";