fix: enforce a single edge entrypoint for next edge handler

Author: mrstork

src/build/functions/edge.ts

@@ -1,7 +1,7 @@
 import { cp, mkdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { dirname, join } from 'node:path'
 
-import type { Manifest, ManifestFunction } from '@netlify/edge-functions'
+import type { IntegrationsConfig, Manifest, ManifestFunction } from '@netlify/edge-functions'
 import { glob } from 'fast-glob'
 import type { EdgeFunctionDefinition as NextDefinition } from 'next/dist/build/webpack/plugins/middleware-plugin.js'
 import { pathToRegexp } from 'path-to-regexp'
@@ -160,21 +160,25 @@ const getHandlerName = ({ name }: Pick<NextDefinition, 'name'>): string =>
 const buildHandlerDefinition = (
   ctx: PluginContext,
   { name, matchers, page }: NextDefinition,
-): Array<ManifestFunction> => {
-  const fun = getHandlerName({ name })
-  const funName = name.endsWith('middleware')
+): ManifestFunction & IntegrationsConfig => {
+  const functionHandlerName = getHandlerName({ name })
+  const functionName = name.endsWith('middleware')
     ? 'Next.js Middleware Handler'
     : `Next.js Edge Handler: ${page}`
   const cache = name.endsWith('middleware') ? undefined : ('manual' as const)
   const generator = `${ctx.pluginName}@${ctx.pluginVersion}`
-
-  return augmentMatchers(matchers, ctx).map((matcher) => ({
-    function: fun,
-    name: funName,
-    pattern: matcher.regexp,
+  const i18nAugmentedMatchers = augmentMatchers(matchers, ctx)
+  const combinedEdgeHandlerRegex = i18nAugmentedMatchers
+    .map((matcher) => `(${matcher.regexp})`)
+    .join('|')
+
+  return {
+    function: functionHandlerName,
+    name: functionName,
+    pattern: combinedEdgeHandlerRegex,
     cache,
     generator,
-  }))
+  }
 }
 
 export const clearStaleEdgeHandlers = async (ctx: PluginContext) => {
@@ -183,10 +187,7 @@ export const clearStaleEdgeHandlers = async (ctx: PluginContext) => {
 
 export const createEdgeHandlers = async (ctx: PluginContext) => {
   const nextManifest = await ctx.getMiddlewareManifest()
-  const nextDefinitions = [
-    ...Object.values(nextManifest.middleware),
-    // ...Object.values(nextManifest.functions)
-  ]
+  const nextDefinitions = [...Object.values(nextManifest.middleware)]
   await Promise.all(nextDefinitions.map((def) => createEdgeHandler(ctx, def)))
 
   const netlifyDefinitions = nextDefinitions.flatMap((def) => buildHandlerDefinition(ctx, def))