archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keep sortedMiddleware intact as it's used by the runtime (#30361)

Browse source 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Tobias Koppers 2021-10-26 22:18:08 +02:00 committed by GitHub
parent 7e9f801b47
commit 95607130a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/next/build/index.ts
View file

@ -1908,7 +1908,7 @@ export default async function build(
'_middlewareManifest.js'
),
`self.__MIDDLEWARE_MANIFEST=${devalue(
middlewareManifest.sortedMiddleware
middlewareManifest.clientInfo
)};self.__MIDDLEWARE_MANIFEST_CB&&self.__MIDDLEWARE_MANIFEST_CB()`
)

19
packages/next/build/webpack/plugins/middleware-plugin.ts
View file

@ -18,7 +18,8 @@ export const ssrEntries = new Map<string, { requireFlightManifest: boolean }>()
export interface MiddlewareManifest {
version: 1
sortedMiddleware: [string, boolean][]
sortedMiddleware: string[]
clientInfo: [string, boolean][]
middleware: {
[page: string]: {
env: string[]
@ -53,6 +54,7 @@ export default class MiddlewarePlugin {
const entrypoints = compilation.entrypoints
const middlewareManifest: MiddlewareManifest = {
sortedMiddleware: [],
clientInfo: [],
middleware: {},
version: 1,
}
@ -102,12 +104,15 @@ export default class MiddlewarePlugin {
middlewareManifest.sortedMiddleware = getSortedRoutes(
Object.keys(middlewareManifest.middleware)
).map((key) => {
const ssrEntryInfo = ssrEntries.get(
middlewareManifest.middleware[key].name
)
return [key, !!ssrEntryInfo]
})
)
middlewareManifest.clientInfo = middlewareManifest.sortedMiddleware.map(
(key) => {
const ssrEntryInfo = ssrEntries.get(
middlewareManifest.middleware[key].name
)
return [key, !!ssrEntryInfo]
}
)
assets[`server/${MIDDLEWARE_MANIFEST}`] = new sources.RawSource(
JSON.stringify(middlewareManifest, null, 2)