more

Author: pieh

edge-runtime/lib/next-request.ts

@@ -2,7 +2,10 @@ import type { Context } from '@netlify/edge-functions'
 
 import type { RequestData } from './types'
 
-export const buildNextRequest = (request: Request): RequestData => {
+export const buildNextRequest = (
+  request: Request,
+  nextConfig: RequestData['nextConfig'],
+): RequestData => {
   const { url, method, body, headers } = request
 
   // we don't really use it but Next.js expects a signal
@@ -11,12 +14,7 @@ export const buildNextRequest = (request: Request): RequestData => {
   return {
     headers: Object.fromEntries(headers.entries()),
     method,
-    // nextConfig?: {
-    //     basePath?: string;
-    //     i18n?: I18NConfig | null;
-    //     trailingSlash?: boolean;
-    //     experimental?: Pick<ExperimentalConfig, 'cacheLife' | 'authInterrupts' | 'clientParamParsingOrigins'>;
-    // };
+    nextConfig,
     // page?: {
     //     name?: string;
     //     params?: {

edge-runtime/middleware.ts

@@ -3,7 +3,7 @@
 import { InternalHeaders } from './lib/headers.ts'
 import { logger, LogLevel } from './lib/logging.ts'
 import { buildNextRequest } from './lib/next-request.ts'
-import type { NextHandler } from './lib/types.ts'
+import type { NextHandler, RequestData } from './lib/types.ts'
 // import { buildResponse } from './lib/response.ts'
 
 /**
@@ -15,7 +15,11 @@ import type { NextHandler } from './lib/types.ts'
  * @param context Netlify-specific context object
  * @param nextHandler Next.js middleware handler
  */
-export async function handleMiddleware(request: Request, nextHandler: NextHandler) {
+export async function handleMiddleware(
+  request: Request,
+  nextHandler: NextHandler,
+  nextConfig: RequestData['nextConfig'],
+) {
   const url = new URL(request.url)
 
   const reqLogger = logger
@@ -25,7 +29,7 @@ export async function handleMiddleware(request: Request, nextHandler: NextHandle
     .withFields({ url_path: url.pathname })
     .withRequestID(request.headers.get(InternalHeaders.NFRequestID))
 
-  const nextRequest = buildNextRequest(request)
+  const nextRequest = buildNextRequest(request, nextConfig)
   try {
     const result = await nextHandler({ request: nextRequest })
 

src/adapter/adapter.ts

@@ -33,7 +33,7 @@ const adapter: NextAdapter = {
     await writeFile('./onBuildComplete.json', JSON.stringify(nextAdapterContext, null, 2))
     // debugger
 
-    const netlifyAdapterContext = createNetlifyAdapterContext(nextAdapterContext)
+    const netlifyAdapterContext = createNetlifyAdapterContext()
 
     await onBuildCompleteForImageCDN(nextAdapterContext, netlifyAdapterContext)
     await onBuildCompleteForMiddleware(nextAdapterContext, netlifyAdapterContext)

src/adapter/build/middleware.ts

@@ -1,13 +1,17 @@
 import { cp, mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises'
 import { dirname, join, parse, relative } from 'node:path/posix'
 
-import type { IntegrationsConfig } from '@netlify/edge-functions'
 import { glob } from 'fast-glob'
-import { pathToRegexp } from 'path-to-regexp'
+
+import type { RequestData } from '../../../edge-runtime/lib/types.ts'
+
+// import type { IntegrationsConfig } from '@netlify/edge-functions'
+
+// import { pathToRegexp } from 'path-to-regexp'
 
 import {
-  DISPLAY_NAME_MIDDLEWARE,
-  GENERATOR,
+  // DISPLAY_NAME_MIDDLEWARE,
+  // GENERATOR,
   NETLIFY_FRAMEWORKS_API_EDGE_FUNCTIONS,
   PLUGIN_DIR,
 } from './constants.js'
@@ -152,6 +156,18 @@ const writeHandlerFile = async (
   // Netlify Edge Functions and the Next.js edge runtime.
   await copyRuntime(MIDDLEWARE_FUNCTION_DIR)
 
+  const nextConfigForMiddleware: RequestData['nextConfig'] = {
+    basePath: nextConfig.basePath,
+    i18n: nextConfig.i18n,
+    trailingSlash: nextConfig.trailingSlash,
+    experimental: {
+      // Include any experimental config that might affect middleware behavior
+      cacheLife: nextConfig.experimental?.cacheLife,
+      authInterrupts: nextConfig.experimental?.authInterrupts,
+      clientParamParsingOrigins: nextConfig.experimental?.clientParamParsingOrigins,
+    },
+  }
+
   // Writing a file with the matchers that should trigger this function. We'll
   // read this file from the function at runtime.
   // await writeFile(
@@ -196,7 +212,9 @@ const writeHandlerFile = async (
     import { handleMiddleware } from './edge-runtime/middleware.ts';
     import handler from './concatenated-file.js';
 
-    export default (req) => handleMiddleware(req, handler);
+    const nextConfig = ${JSON.stringify(nextConfigForMiddleware)}
+
+    export default (req) => handleMiddleware(req, handler, nextConfig);
     `,
   )
 }

src/adapter/build/routing.ts

@@ -62,7 +62,7 @@ export async function generateRoutingRules(
   nextAdapterContext: OnBuildCompleteContext,
   netlifyAdapterContext: NetlifyAdapterContext,
 ) {
-  const escapedBuildId = escapeStringRegexp(nextAdapterContext.buildId)
+  // const escapedBuildId = escapeStringRegexp(nextAdapterContext.buildId)
 
   const hasMiddleware = Boolean(nextAdapterContext.outputs.middleware)
   const hasPages =
@@ -72,7 +72,7 @@ export async function generateRoutingRules(
     nextAdapterContext.outputs.appPages.length !== 0 ||
     nextAdapterContext.outputs.appRoutes.length !== 0
   const shouldDenormalizeJsonDataForMiddleware =
-    hasMiddleware && hasPages && nextAdapterContext.config.skipMiddlewareUrlNormalize
+    hasMiddleware && hasPages && !nextAdapterContext.config.skipMiddlewareUrlNormalize
 
   // group redirects by priority, as it impact ordering of routing rules
   const priorityRedirects: RoutingRuleApply[] = []
@@ -128,7 +128,7 @@ export async function generateRoutingRules(
         {
           description: 'Normalize _next/data',
           match: {
-            path: `^${nextAdapterContext.config.basePath}/_next/data/${escapedBuildId}/(.*)\\.json`,
+            path: `^${nextAdapterContext.config.basePath}/_next/data/${nextAdapterContext.buildId}/(.*)\\.json`,
             has: [
               {
                 type: 'header',
@@ -140,6 +140,7 @@ export async function generateRoutingRules(
             type: 'rewrite',
             destination: `${nextAdapterContext.config.basePath}/$1${nextAdapterContext.config.trailingSlash ? '/' : ''}`,
           },
+          continue: true,
         },
         {
           description: 'Fix _next/data index normalization',
@@ -156,6 +157,7 @@ export async function generateRoutingRules(
             type: 'rewrite',
             destination: `${nextAdapterContext.config.basePath}/`,
           },
+          continue: true,
         },
       ]
     : []
@@ -177,6 +179,7 @@ export async function generateRoutingRules(
             type: 'rewrite',
             destination: `${nextAdapterContext.config.basePath}/index`,
           },
+          continue: true,
         },
         {
           description: 'Denormalize _next/data',
@@ -193,6 +196,7 @@ export async function generateRoutingRules(
             type: 'rewrite',
             destination: `${nextAdapterContext.config.basePath}/_next/data/${nextAdapterContext.buildId}/$1.json`,
           },
+          continue: true,
         },
       ]
     : []
@@ -312,23 +316,22 @@ export async function generateRoutingRules(
 
     // server actions name meta routes
 
-    ...denormalizeNextData, // originally: // if skip middleware url normalize we denormalize _next/data if middleware + pages
-
     ...(hasMiddleware
       ? [
           {
             // originally: middleware route
             description: 'Middleware',
             // match: {
+            //   path: 'test',
+            // },
+            // match: {
             //   path: 'wat',
             // },
             apply: { type: 'middleware' },
           } as const,
         ]
       : []),
 
-    ...normalizeNextData, // originally: // if skip middleware url normalize we normalize _next/data if middleware + pages
-
     // ...convertedRewrites.beforeFiles,
 
     // add 404 handling if /404 or locale variants are requested literally
@@ -487,6 +490,7 @@ export async function generateRoutingRules(
       routingPhase: 'rewrite',
     },
 
+    ...denormalizeNextData,
     // denormalize _next/data if middleware + pages
 
     // apply _next/data routes (including static ones if middleware + pages)
@@ -508,7 +512,7 @@ export async function generateRoutingRules(
                 '/',
                 nextAdapterContext.config.basePath,
                 '/_next/data/',
-                escapedBuildId,
+                nextAdapterContext.buildId,
                 '/(.*).json',
               )}`,
             },
@@ -529,7 +533,7 @@ export async function generateRoutingRules(
                 '/',
                 nextAdapterContext.config.basePath,
                 '/_next/data/',
-                escapedBuildId,
+                nextAdapterContext.buildId,
                 '/(.*).json',
               )}`,
             },

src/adapter/run/routing.ts

@@ -142,17 +142,18 @@ async function match(
   let currentRequest = request
   let maybeResponse: MaybeResponse = initialResponse
 
-  const currentURL = new URL(currentRequest.url)
-  let { pathname } = currentURL
-
   return tracer.withActiveSpan(spanName, async (span) => {
     for (const rule of routingRules) {
+      const currentURL = new URL(currentRequest.url)
+      const { pathname } = currentURL
+
       const desc = rule.description ?? JSON.stringify(rule)
       // eslint-disable-next-line no-loop-func
       const result = await tracer.withActiveSpan(desc, async (span) => {
-        log('Evaluating rule:', desc)
+        log('Evaluating rule:', desc, pathname)
 
         let matched = false
+        let shouldContinueOnMatch = rule.continue ?? false
 
         if ('type' in rule) {
           if (rule.type === 'static-asset-or-function') {
@@ -172,7 +173,7 @@ async function match(
                   new URL(staticAlias, currentRequest.url),
                   currentRequest,
                 )
-                pathname = staticAlias
+                // pathname = staticAlias
               }
             }
 
@@ -213,6 +214,7 @@ async function match(
               }
             } else {
               span.setStatus({ code: SpanStatusCode.ERROR, message: 'Miss' })
+              // log('Path did not match regex', rule.match.path, pathname)
               return
             }
           }
@@ -224,10 +226,18 @@ async function match(
                 if (typeof condition.value === 'undefined') {
                   if (!currentRequest.headers.has(condition.key)) {
                     hasAllMatch = false
+                    // log('request header does not exist', {
+                    //   key: condition.key,
+                    // })
                     break
                   }
                 } else if (currentRequest.headers.get(condition.key) !== condition.value) {
                   hasAllMatch = false
+                  // log('request header not the same', {
+                  //   key: condition.key,
+                  //   match: condition.value,
+                  //   actual: currentRequest.headers.get(condition.key),
+                  // })
                   break
                 }
               }
@@ -381,12 +391,15 @@ async function match(
                   new URL(rewriteUrl, currentRequest.url),
                   currentRequest,
                 )
+                shouldContinueOnMatch = true
               } else if (nextRedirect) {
+                shouldContinueOnMatch = true
                 // just continue
                 // } else if (redirect) {
                 //   relativizeURL(redirect, currentRequest.url)
               } else if (isNext) {
                 // just continue
+                shouldContinueOnMatch = true
               } else {
                 // this includes redirect case
                 maybeResponse = {
@@ -458,7 +471,7 @@ async function match(
           }
         }
 
-        if (matched && !rule.continue) {
+        if (matched && !shouldContinueOnMatch) {
           // once hit a match short circuit, unless we should continue
           return { maybeResponse, currentRequest }
         }