@@ -159,22 +159,17 @@ const getHandlerName = ({ name }: Pick<NextDefinition, 'name'>): string =>
159
159
160
160
const buildHandlerDefinition = (
161
161
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 ( '|' )
168
166
const cache = name . endsWith ( 'middleware' ) ? undefined : ( 'manual' as const )
169
- const generator = `${ ctx . pluginName } @${ ctx . pluginVersion } `
170
167
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 ,
175
171
cache,
176
- generator,
177
- } ) )
172
+ }
178
173
}
179
174
180
175
export const clearStaleEdgeHandlers = async ( ctx : PluginContext ) => {
@@ -183,10 +178,7 @@ export const clearStaleEdgeHandlers = async (ctx: PluginContext) => {
183
178
184
179
export const createEdgeHandlers = async ( ctx : PluginContext ) => {
185
180
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 ) ]
190
182
await Promise . all ( nextDefinitions . map ( ( def ) => createEdgeHandler ( ctx , def ) ) )
191
183
192
184
const netlifyDefinitions = nextDefinitions . flatMap ( ( def ) => buildHandlerDefinition ( ctx , def ) )
0 commit comments