Merge branch 'main' into jake/htmlrewriter

Author: pieh

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "5.8.1"
+  ".": "5.9.0"
 }

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [5.9.0](https://github.com/opennextjs/opennextjs-netlify/compare/v5.8.1...v5.9.0) (2024-12-09)
+
+
+### Features
+
+* support after() ([#2717](https://github.com/opennextjs/opennextjs-netlify/issues/2717)) ([51e5373](https://github.com/opennextjs/opennextjs-netlify/commit/51e5373e4914e9b76edf439e8de01c561742bdaa))
+
+
+### Bug Fixes
+
+* add data request query param to the cache key ([#2701](https://github.com/opennextjs/opennextjs-netlify/issues/2701)) ([00e3a4b](https://github.com/opennextjs/opennextjs-netlify/commit/00e3a4be19bf8428ea6ce1ed2ae74a8ac8375532))
+
 ## [5.8.1](https://github.com/netlify/next-runtime/compare/v5.8.0...v5.8.1) (2024-10-21)
 
 

package-lock.json

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

package.json

@@ -3,7 +3,10 @@ import { nextVersionSatisfies } from '../utils/next-version-helpers.mjs'
 import { test } from '../utils/playwright-helpers.js'
 
 test('next/after callback is executed and finishes', async ({ page, after }) => {
-  test.skip(!nextVersionSatisfies('>=15.0.0'), 'This test is only for Next.js 15+')
+  test.skip(
+    !nextVersionSatisfies('>=15.1.0'),
+    'This test is only for Next.js >=15.1.0 that has stable after() support',
+  )
 
   // trigger initial request to check page which might be stale and allow regenerating in background
   await page.goto(`${after.url}/after/check`)
@@ -25,7 +28,9 @@ test('next/after callback is executed and finishes', async ({ page, after }) =>
 
   expect(pageInfo2.timestamp, 'Check page should be cached').toBe(pageInfo1.timestamp)
 
-  await page.goto(`${after.url}/after/trigger`)
+  const response = await page.goto(`${after.url}/after/trigger`)
+
+  expect(response?.status(), 'Trigger should return 200').toBe(200)
 
   // wait for next/after to trigger revalidation of check page
   await new Promise((resolve) => setTimeout(resolve, 5000))

tests/e2e/after.test.ts

@@ -1,5 +1,5 @@
 import { revalidatePath } from 'next/cache'
-import { unstable_after as after, connection } from 'next/server'
+import { after, connection } from 'next/server'
 
 export default async function Page() {
   await connection()

tests/fixtures/after/app/after/trigger/page.js

@@ -4,9 +4,6 @@ const nextConfig = {
   eslint: {
     ignoreDuringBuilds: true,
   },
-  experimental: {
-    after: true,
-  },
 }
 
 module.exports = nextConfig

tests/fixtures/after/next.config.js

@@ -14,7 +14,7 @@
   },
   "test": {
     "dependencies": {
-      "next": ">=15.0.0"
+      "next": ">=15.1.0"
     }
   }
 }

tests/fixtures/after/package.json

@@ -85,7 +85,7 @@ export async function setNextVersionInFixture(
         if (
           operation === 'update' &&
           versionConstraint &&
-          !satisfies(checkVersion, versionConstraint) &&
+          !satisfies(checkVersion, versionConstraint, { includePrerelease: true }) &&
           version !== versionConstraint
         ) {
           if (!silent) {