Skip to content

Commit a657e2f

Browse files
committed
fix: enforce a single edge entrypoint for next edge handler
1 parent cc81992 commit a657e2f

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

src/build/functions/edge.ts

+9-17
Original file line numberDiff line numberDiff line change
@@ -159,22 +159,17 @@ const getHandlerName = ({ name }: Pick<NextDefinition, 'name'>): string =>
159159

160160
const buildHandlerDefinition = (
161161
ctx: PluginContext,
162-
{ name, matchers, page }: NextDefinition,
163-
): Array<ManifestFunction> => {
164-
const fun = getHandlerName({ name })
165-
const funName = name.endsWith('middleware')
166-
? 'Next.js Middleware Handler'
167-
: `Next.js Edge Handler: ${page}`
162+
{ name, matchers }: NextDefinition,
163+
): ManifestFunction => {
164+
const i18nAugmentedMatchers = augmentMatchers(matchers, ctx)
165+
const combinedEdgeHandlerRegex = i18nAugmentedMatchers.map((matcher) => `(${matcher.regexp})`).join('|')
168166
const cache = name.endsWith('middleware') ? undefined : ('manual' as const)
169-
const generator = `${ctx.pluginName}@${ctx.pluginVersion}`
170167

171-
return augmentMatchers(matchers, ctx).map((matcher) => ({
172-
function: fun,
173-
name: funName,
174-
pattern: matcher.regexp,
168+
return {
169+
function: getHandlerName({ name }),
170+
pattern: combinedEdgeHandlerRegex,
175171
cache,
176-
generator,
177-
}))
172+
}
178173
}
179174

180175
export const clearStaleEdgeHandlers = async (ctx: PluginContext) => {
@@ -183,10 +178,7 @@ export const clearStaleEdgeHandlers = async (ctx: PluginContext) => {
183178

184179
export const createEdgeHandlers = async (ctx: PluginContext) => {
185180
const nextManifest = await ctx.getMiddlewareManifest()
186-
const nextDefinitions = [
187-
...Object.values(nextManifest.middleware),
188-
// ...Object.values(nextManifest.functions)
189-
]
181+
const nextDefinitions = [...Object.values(nextManifest.middleware)]
190182
await Promise.all(nextDefinitions.map((def) => createEdgeHandler(ctx, def)))
191183

192184
const netlifyDefinitions = nextDefinitions.flatMap((def) => buildHandlerDefinition(ctx, def))

0 commit comments

Comments
 (0)