chore: fix rewrites

Author: ascorbic

package.json

@@ -22,6 +22,7 @@
     "test:next:disabled": "RUN_SKIPPED_TESTS=1 jest -c test/e2e/jest.config.disabled.js",
     "test:next:all": "RUN_SKIPPED_TESTS=1 jest -c test/e2e/jest.config.all.js",
     "test:next:appdir": "NEXT_TEST_VERSION=canary jest -c test/e2e/jest.config.appdir.js",
+    "test:next:router": "jest -c test/e2e/jest.config.router.js",
     "test:jest": "jest",
     "playwright:install": "playwright install --with-deps chromium",
     "test:jest:update": "jest --updateSnapshot",

packages/runtime/src/templates/edge-shared/utils.ts

@@ -151,6 +151,7 @@ export const buildResponse = async ({
 
     // The edge router handles rewrites itself, so we don't need to redirect or rewrite here
     if (useEdgeRouter()) {
+      request.headers.set('x-middleware-rewrite', relativeUrl)
       return addMiddlewareHeaders(context.next(), res)
     }
     if (rewriteUrl.hostname !== baseUrl.hostname) {

packages/runtime/src/templates/edge/router-post-middleware.ts

@@ -13,7 +13,7 @@ import type { RoutesManifest } from '../edge-shared/next-utils.ts'
 const handler = async (request: Request, context: Context) => {
   const rewrite = request.headers.get('x-middleware-rewrite')
   const result = runPostMiddleware(
-    rewrite ? new Request(rewrite, request) : request,
+    rewrite ? new Request(new URL(rewrite, request.url), request) : request,
     routesManifest as unknown as RoutesManifest,
     new Set(staticRoutes),
   )

packages/runtime/src/templates/edge/router-pre-middleware.ts

@@ -16,6 +16,9 @@ globalThis.NETLIFY_NEXT_EDGE_ROUTER = true
  */
 
 const handler = async (request: Request, context: Context) => {
+  // We add this ourselves. Don't allow users to forge it.
+  request.headers.delete('x-matched-path')
+
   const manifest: RoutesManifest = routesManifest as unknown as RoutesManifest
 
   // Get changed response headers
@@ -24,7 +27,6 @@ const handler = async (request: Request, context: Context) => {
   const redirect = applyRedirectRules(request, manifest.redirects)
   let response: Response
   if (redirect) {
-    console.log({ redirect })
     response = redirect
   } else if (extraHeaders.length === 0) {
     // No redirect and no new headers, so we can skip to the next function