Commit b3ab558

authored

fix: ensure internal x-middleware-set-cookie header is not passed on to lambda (#2891)

* fix: ensure internal x-middleware-set-cookie header is not set when setting cookies in middleware * fix: make environment variables for draft mode available at edge

1 parent 5489c0d commit b3ab558Copy full SHA for b3ab558

File tree

2 files changed

+15

-9

lines changed

edge-runtime/lib
- middleware.ts
src/build/functions
- edge.ts

2 files changed

+15

-9

lines changed

`‎edge-runtime/lib/middleware.ts`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ export function mergeMiddlewareCookies(middlewareResponse: Response, lambdaReque`
`67`	`67`	`const middlewareCookies = middlewareResponse.headers.get('x-middleware-set-cookie')`
`68`	`68`
`69`	`69`	`if (middlewareCookies) {`
	`70`	`+ // Next expects internal headers to be omitted when cookies are set by the middleware`
	`71`	`+ // See: https://github.com/vercel/next.js/blob/005db43079c7b59fd8c2594e8362761dc4cb3211/test/e2e/app-dir/app-middleware/app-middleware.test.ts#L197-L207`
	`72`	`+ middlewareResponse.headers.delete('x-middleware-set-cookie')`
	`73`	`+`
`70`	`74`	`// Targets commas that are not followed by whitespace`
`71`	`75`	`// See: https://github.com/vercel/next.js/blob/e6145d3a37bb4c7b481fd58e05cdff9046ace8ad/packages/next/src/server/web/spec-extension/response.ts#L58-L66`
`72`	`76`	`const regex = new RegExp(/,(?!\s)/)`

`‎src/build/functions/edge.ts`

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ const writeHandlerFile = async (ctx: PluginContext, { matchers, name }: NextDefi`
`119`	`119`
`120`	`120`	`const copyHandlerDependencies = async (`
`121`	`121`	`ctx: PluginContext,`
`122`		`- { name, files, wasm }: NextDefinition,`
	`122`	`+ { name, env,files, wasm }: NextDefinition,`
`123`	`123`	`) => {`
`124`	`124`	`const srcDir = join(ctx.standaloneDir, ctx.nextDistDir)`
`125`	`125`	`const destDir = join(ctx.edgeFunctionsDir, getHandlerName({ name }))`
`@@ -132,6 +132,11 @@ const copyHandlerDependencies = async (`
`132`	`132`
`133`	`133`	const outputFile = join(destDir, `server/${name}.js`)
`134`	`134`
	`135`	`+ // Prepare environment variables for draft-mode (i.e. __NEXT_PREVIEW_MODE_ID, __NEXT_PREVIEW_MODE_SIGNING_KEY, __NEXT_PREVIEW_MODE_ENCRYPTION_KEY)`
	`136`	`+ for (const [key, value] of Object.entries(env)) {`
	`137`	+ parts.push(`process.env.${key} = '${value}';`)
	`138`	`+ }`
	`139`	`+`
`135`	`140`	`if (wasm?.length) {`
`136`	`141`	`for (const wasmChunk of wasm ?? []) {`
`137`	`142`	`const data = await readFile(join(srcDir, wasmChunk.filePath))`
`@@ -161,16 +166,16 @@ const buildHandlerDefinition = (`
`161`	`166`	`ctx: PluginContext,`
`162`	`167`	`{ name, matchers, page }: NextDefinition,`
`163`	`168`	`): Array<ManifestFunction> => {`
`164`		`- const fun = getHandlerName({ name })`
`165`		`- const funName = name.endsWith('middleware')`
	`169`	`+ const functionHandlerName = getHandlerName({ name })`
	`170`	`+ const functionName = name.endsWith('middleware')`
`166`	`171`	`? 'Next.js Middleware Handler'`
`167`	`172`	: `Next.js Edge Handler: ${page}`
`168`	`173`	`const cache = name.endsWith('middleware') ? undefined : ('manual' as const)`
`169`	`174`	const generator = `${ctx.pluginName}@${ctx.pluginVersion}`
`170`	`175`
`171`	`176`	`return augmentMatchers(matchers, ctx).map((matcher) => ({`
`172`		`- function: fun,`
`173`		`- name: funName,`
	`177`	`+ function: functionHandlerName,`
	`178`	`+ name: functionName,`
`174`	`179`	`pattern: matcher.regexp,`
`175`	`180`	`cache,`
`176`	`181`	`generator,`
`@@ -183,10 +188,7 @@ export const clearStaleEdgeHandlers = async (ctx: PluginContext) => {`
`183`	`188`
`184`	`189`	`export const createEdgeHandlers = async (ctx: PluginContext) => {`
`185`	`190`	`const nextManifest = await ctx.getMiddlewareManifest()`
`186`		`- const nextDefinitions = [`
`187`		`- ...Object.values(nextManifest.middleware),`
`188`		`- // ...Object.values(nextManifest.functions)`
`189`		`- ]`
	`191`	`+ const nextDefinitions = [...Object.values(nextManifest.middleware)]`
`190`	`192`	`await Promise.all(nextDefinitions.map((def) => createEdgeHandler(ctx, def)))`
`191`	`193`
`192`	`194`	`const netlifyDefinitions = nextDefinitions.flatMap((def) => buildHandlerDefinition(ctx, def))`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit b3ab558

File tree

2 files changed

2 files changed

`‎edge-runtime/lib/middleware.ts`

`‎src/build/functions/edge.ts`

0 commit comments