Merge branch 'main' into fix/noop-empty-revalidate-tags

Author: pieh

.release-please-manifest.json

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

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [5.9.1](https://github.com/opennextjs/opennextjs-netlify/compare/v5.9.0...v5.9.1) (2024-12-18)
+
+
+### Bug Fixes
+
+* use version of htmlrewriter which does not make use of asyncify, which looks to have a potential memory leak under high load ([#2721](https://github.com/opennextjs/opennextjs-netlify/issues/2721)) ([4d7ad97](https://github.com/opennextjs/opennextjs-netlify/commit/4d7ad97c3f16b01000989bde06352f86b5d526ba))
+
 ## [5.9.0](https://github.com/opennextjs/opennextjs-netlify/compare/v5.8.1...v5.9.0) (2024-12-09)
 
 

package-lock.json

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

package.json

@@ -64,8 +64,10 @@ test.describe('next/image is using Netlify Image CDN', () => {
 
     expect(nextImageResponse.status()).toBe(200)
     // ensure next/image is using Image CDN
-    // source image is jpg, but when requesting it through Image CDN avif will be returned
-    expect(await nextImageResponse.headerValue('content-type')).toEqual('image/avif')
+    // source image is jpg, but when requesting it through Image CDN avif or webp will be returned
+    expect(['image/avif', 'image/webp']).toContain(
+      await nextImageResponse.headerValue('content-type'),
+    )
 
     await expectImageWasLoaded(page.locator('img'))
   })

tests/e2e/export.test.ts

@@ -119,8 +119,10 @@ test.describe('next/image is using Netlify Image CDN', () => {
 
     expect(nextImageResponse.status()).toBe(200)
     // ensure next/image is using Image CDN
-    // source image is jpg, but when requesting it through Image CDN avif will be returned
-    expect(await nextImageResponse.headerValue('content-type')).toEqual('image/avif')
+    // source image is jpg, but when requesting it through Image CDN avif or webp will be returned
+    expect(['image/avif', 'image/webp']).toContain(
+      await nextImageResponse.headerValue('content-type'),
+    )
 
     await expectImageWasLoaded(page.locator('img'))
   })
@@ -142,7 +144,9 @@ test.describe('next/image is using Netlify Image CDN', () => {
     )
 
     expect(nextImageResponse.status()).toBe(200)
-    expect(await nextImageResponse.headerValue('content-type')).toEqual('image/avif')
+    expect(['image/avif', 'image/webp']).toContain(
+      await nextImageResponse.headerValue('content-type'),
+    )
 
     await expectImageWasLoaded(page.locator('img'))
   })
@@ -164,7 +168,9 @@ test.describe('next/image is using Netlify Image CDN', () => {
     )
 
     expect(nextImageResponse.status()).toBe(200)
-    expect(await nextImageResponse.headerValue('content-type')).toEqual('image/avif')
+    expect(['image/avif', 'image/webp']).toContain(
+      await nextImageResponse.headerValue('content-type'),
+    )
 
     await expectImageWasLoaded(page.locator('img'))
   })
@@ -183,7 +189,9 @@ test.describe('next/image is using Netlify Image CDN', () => {
     )
 
     expect(nextImageResponse?.status()).toBe(200)
-    expect(await nextImageResponse.headerValue('content-type')).toEqual('image/avif')
+    expect(['image/avif', 'image/webp']).toContain(
+      await nextImageResponse.headerValue('content-type'),
+    )
 
     await expectImageWasLoaded(page.locator('img'))
   })
@@ -203,7 +211,9 @@ test.describe('next/image is using Netlify Image CDN', () => {
     )
 
     expect(nextImageResponse.status()).toEqual(200)
-    expect(await nextImageResponse.headerValue('content-type')).toEqual('image/avif')
+    expect(['image/avif', 'image/webp']).toContain(
+      await nextImageResponse.headerValue('content-type'),
+    )
 
     await expectImageWasLoaded(page.locator('img'))
   })