fix: correctly handle matchers with lookaheads and i18n

Author: ascorbic

demos/middleware/middleware.ts

@@ -94,7 +94,7 @@ export const config = {
     '/api/:all*',
     '/headers',
     { source: '/static' },
-    { source: '/shows/:all*' },
+    { source: '/shows/((?!99|88).*)' },
     {
       source: '/conditional',
       has: [

package-lock.json

@@ -28,6 +28,7 @@
     "p-limit": "^3.1.0",
     "pathe": "^0.2.0",
     "pretty-bytes": "^5.6.0",
+    "regexp-tree": "^0.1.24",
     "semver": "^7.3.5",
     "slash": "^3.0.0",
     "tiny-glob": "^0.2.9"

packages/runtime/package.json

@@ -5,12 +5,13 @@ import { resolve, join } from 'path'
 import type { NetlifyConfig, NetlifyPluginConstants } from '@netlify/build'
 import { greenBright } from 'chalk'
 import destr from 'destr'
-import { copy, copyFile, emptyDir, ensureDir, readJSON, readJson, writeJSON, writeJson } from 'fs-extra'
+import { copy, copyFile, emptyDir, ensureDir, readJson, writeJSON, writeJson } from 'fs-extra'
 import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middleware-plugin'
 import type { RouteHas } from 'next/dist/lib/load-custom-routes'
 import { outdent } from 'outdent'
 
-import { getRequiredServerFiles } from './config'
+import { getRequiredServerFiles, NextConfig } from './config'
+import { makeLocaleOptional, stripLookahead } from './matchers'
 
 // This is the format as of next@12.2
 interface EdgeFunctionDefinitionV1 {
@@ -132,10 +133,12 @@ const writeEdgeFunction = async ({
   edgeFunctionDefinition,
   edgeFunctionRoot,
   netlifyConfig,
+  nextConfig,
 }: {
   edgeFunctionDefinition: EdgeFunctionDefinition
   edgeFunctionRoot: string
   netlifyConfig: NetlifyConfig
+  nextConfig: NextConfig
 }): Promise<
   Array<{
     function: string
@@ -165,14 +168,21 @@ const writeEdgeFunction = async ({
   // The v1 middleware manifest has a single regexp, but the v2 has an array of matchers
   if ('regexp' in edgeFunctionDefinition) {
     matchers.push({ regexp: edgeFunctionDefinition.regexp })
+  } else if (nextConfig.i18n) {
+    matchers.push(
+      ...edgeFunctionDefinition.matchers.map((matcher) => ({
+        regexp: makeLocaleOptional(matcher.regexp),
+      })),
+    )
   } else {
     matchers.push(...edgeFunctionDefinition.matchers)
   }
+
   await writeJson(join(edgeFunctionDir, 'matchers.json'), matchers)
 
   // We add a defintion for each matching path
   return matchers.map((matcher) => {
-    const pattern = matcher.regexp
+    const pattern = stripLookahead(matcher.regexp)
     return { function: name, pattern, name: edgeFunctionDefinition.name }
   })
 }
@@ -258,6 +268,7 @@ export const writeEdgeFunctions = async (netlifyConfig: NetlifyConfig) => {
         edgeFunctionDefinition,
         edgeFunctionRoot,
         netlifyConfig,
+        nextConfig,
       })
       manifest.functions.push(...functionDefinitions)
     }
@@ -270,6 +281,7 @@ export const writeEdgeFunctions = async (netlifyConfig: NetlifyConfig) => {
           edgeFunctionDefinition,
           edgeFunctionRoot,
           netlifyConfig,
+          nextConfig,
         })
         manifest.functions.push(...functionDefinitions)
       }
@@ -284,9 +296,4 @@ export const writeEdgeFunctions = async (netlifyConfig: NetlifyConfig) => {
   await writeJson(join(edgeFunctionRoot, 'manifest.json'), manifest)
 }
 
-export const enableEdgeInNextConfig = async (publish: string) => {
-  const configFile = join(publish, 'required-server-files.json')
-  const config = await readJSON(configFile)
-  await writeJSON(configFile, config)
-}
 /* eslint-enable max-lines */