Merge branch 'main' into middleware-cookies-internal-header

Author: mrstork

.github/workflows/run-tests.yml

@@ -58,7 +58,7 @@ jobs:
           node-version: '18.x'
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - name: setup pnpm/yarn
         run: |
           npm install -g corepack
@@ -114,13 +114,18 @@ jobs:
 
   test:
     needs: setup
-    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         shard: [1, 2, 3, 4, 5, 6, 7, 8]
         os: [ubuntu-latest, windows-latest]
         version: ${{ fromJson(needs.setup.outputs.matrix) }}
+        exclude:
+          - os: windows-latest
+            version: '13.5.1'
+          - os: windows-latest
+            version: '14.2.15'
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: 'Install Node'

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "5.10.7"
+  ".": "5.11.1"
 }

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [5.11.1](https://github.com/opennextjs/opennextjs-netlify/compare/v5.11.0...v5.11.1) (2025-05-06)
+
+
+### Bug Fixes
+
+* **edge-runtime:** match path with URI-encoded chars ([#2873](https://github.com/opennextjs/opennextjs-netlify/issues/2873)) ([7fe6b3b](https://github.com/opennextjs/opennextjs-netlify/commit/7fe6b3b634322de47d06110e952a5b67bc8e1d1c))
+
+## [5.11.0](https://github.com/opennextjs/opennextjs-netlify/compare/v5.10.7...v5.11.0) (2025-05-05)
+
+
+### Features
+
+* support 'use cache' ([#2862](https://github.com/opennextjs/opennextjs-netlify/issues/2862)) ([2810004](https://github.com/opennextjs/opennextjs-netlify/commit/2810004a2cbeeb738cbe7cf70f2b8bd2bbea6156))
+
+
+### Bug Fixes
+
+* add a fallback for loadManifest import path ([#2881](https://github.com/opennextjs/opennextjs-netlify/issues/2881)) ([a9119d3](https://github.com/opennextjs/opennextjs-netlify/commit/a9119d3574e30dd61b22ab80f273f12ed7f2982f))
+* remove unused OTel tracing setup ([#2874](https://github.com/opennextjs/opennextjs-netlify/issues/2874)) ([a220a30](https://github.com/opennextjs/opennextjs-netlify/commit/a220a30fa3d5ff14b6059963630825c8b3dd1005))
+
 ## [5.10.7](https://github.com/opennextjs/opennextjs-netlify/compare/v5.10.6...v5.10.7) (2025-04-18)
 
 

e2e-report/package-lock.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@netlify/plugin-nextjs": "^5.10.7",
+    "@netlify/plugin-nextjs": "^5.11.1",
     "next": "^14.2.26",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"

e2e-report/package.json

@@ -163,25 +163,13 @@ export const buildResponse = async ({
 
     if (rewriteUrl.origin !== baseUrl.origin) {
       logger.withFields({ rewrite_url: rewrite }).debug('Rewriting to external url')
-      let proxyRequest: Request
+      const proxyRequest = await cloneRequest(rewriteUrl, request)
 
       // Remove Netlify internal headers
-      const headers = new Headers(
-        [...request.headers.entries()].filter(([key]) => !key.startsWith('x-nf-')),
-      )
-      if (request.body && !request.bodyUsed) {
-        // This is not ideal, but streaming to an external URL doesn't work
-        const body = await request.arrayBuffer()
-        proxyRequest = new Request(rewriteUrl, {
-          headers,
-          method: request.method,
-          body,
-        })
-      } else {
-        proxyRequest = new Request(rewriteUrl, {
-          headers,
-          method: request.method,
-        })
+      for (const key of request.headers.keys()) {
+        if (key.startsWith('x-nf-')) {
+          proxyRequest.headers.delete(key)
+        }
       }
 
       return addMiddlewareHeaders(fetch(proxyRequest, { redirect: 'manual' }), edgeResponse)
@@ -207,7 +195,7 @@ export const buildResponse = async ({
     request.headers.set('x-middleware-rewrite', target)
 
     // coookies set in middleware need to be available during the lambda request
-    const newRequest = new Request(target, request)
+    const newRequest = await cloneRequest(target, request)
     const newRequestCookies = mergeMiddlewareCookies(edgeResponse, newRequest)
     if (newRequestCookies) {
       newRequest.headers.set('Cookie', newRequestCookies)
@@ -241,7 +229,7 @@ export const buildResponse = async ({
     edgeResponse.headers.delete('x-middleware-next')
 
     // coookies set in middleware need to be available during the lambda request
-    const newRequest = new Request(request)
+    const newRequest = await cloneRequest(request.url, request)
     const newRequestCookies = mergeMiddlewareCookies(edgeResponse, newRequest)
     if (newRequestCookies) {
       newRequest.headers.set('Cookie', newRequestCookies)
@@ -284,3 +272,13 @@ function normalizeLocalizedTarget({
   }
   return targetUrl.toString()
 }
+
+async function cloneRequest(url, request: Request) {
+  // This is not ideal, but streaming to an external URL doesn't work
+  const body = request.body && !request.bodyUsed ? await request.arrayBuffer() : undefined
+  return new Request(url, {
+    headers: request.headers,
+    method: request.method,
+    body,
+  })
+}

edge-runtime/lib/response.ts

@@ -424,14 +424,24 @@ export interface MiddlewareMatcher {
   missing?: RouteHas[]
 }
 
+const decodeMaybeEncodedPath = (path: string): string => {
+  try {
+    return decodeURIComponent(path)
+  } catch {
+    return path
+  }
+}
+
 export function getMiddlewareRouteMatcher(matchers: MiddlewareMatcher[]): MiddlewareRouteMatch {
   return (
-    pathname: string | null | undefined,
+    unsafePathname: string | null | undefined,
     req: Pick<Request, 'headers' | 'url'>,
     query: Params,
   ) => {
+    const pathname = decodeMaybeEncodedPath(unsafePathname ?? '')
+
     for (const matcher of matchers) {
-      const routeMatch = new RegExp(matcher.regexp).exec(pathname!)
+      const routeMatch = new RegExp(matcher.regexp).exec(pathname)
       if (!routeMatch) {
         continue
       }