Unverified Commit 12e22edd authored by Justin Ridgewell's avatar Justin Ridgewell Committed by GitHub

[turbopack]: Serve `_devMiddlewareManifest.json` from router (#50241)

This change allows the Turbopack's node router to serve
`_next/static/development/_devMiddlewareManifest.json` file, which is
just the matchers for middleware routes. This is usually handled by the
node dev server anyways, but we were filtering out the route so that
Turbopack could handle it.

But, Turbopack doesn't implement the route matching logic at all, it's
all handled by our node router. So Turbopack can't know what the
middleware matchers are. Having the router just handle this like the
normal dev server is both easy and efficient (I don't want to spin up
_another_ node instance just to transform the matchers into the expected
format).

Fixes WEB-979

---------
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 1079c100
...@@ -15,6 +15,10 @@ import 'next/dist/server/node-polyfill-fetch.js' ...@@ -15,6 +15,10 @@ import 'next/dist/server/node-polyfill-fetch.js'
import middlewareChunkGroup from 'MIDDLEWARE_CHUNK_GROUP' import middlewareChunkGroup from 'MIDDLEWARE_CHUNK_GROUP'
import middlewareConfig from 'MIDDLEWARE_CONFIG' import middlewareConfig from 'MIDDLEWARE_CONFIG'
type Resolver = Awaited<
ReturnType<typeof import('next/dist/server/lib/route-resolver').makeResolver>
>
type RouterRequest = { type RouterRequest = {
method: string method: string
pathname: string pathname: string
...@@ -51,16 +55,12 @@ type MiddlewareHeadersResponse = { ...@@ -51,16 +55,12 @@ type MiddlewareHeadersResponse = {
headers: [string, string][] headers: [string, string][]
} }
let resolveRouteMemo: Promise< let resolveRouteMemo: Promise<Resolver>
(req: IncomingMessage, res: ServerResponse) => Promise<void>
>
async function getResolveRoute( async function getResolveRoute(
dir: string, dir: string,
serverInfo: ServerInfo serverInfo: ServerInfo
): ReturnType< ): Promise<Resolver> {
typeof import('next/dist/server/lib/route-resolver').makeResolver
> {
const nextConfig = await loadConfig( const nextConfig = await loadConfig(
PHASE_DEVELOPMENT_SERVER, PHASE_DEVELOPMENT_SERVER,
process.cwd(), process.cwd(),
......
...@@ -17,6 +17,3 @@ globalThis.__webpack_require__ = (name) => { ...@@ -17,6 +17,3 @@ globalThis.__webpack_require__ = (name) => {
// initialize() needs `__webpack_public_path__` to be defined. // initialize() needs `__webpack_public_path__` to be defined.
globalThis.__webpack_public_path__ = undefined globalThis.__webpack_public_path__ = undefined
// Avoids Next loading _next/static/[buildId]/_devMiddlewareManifest.json
globalThis.__DEV_MIDDLEWARE_MATCHERS = []
...@@ -174,7 +174,11 @@ impl ContentSource for DevManifestContentSource { ...@@ -174,7 +174,11 @@ impl ContentSource for DevManifestContentSource {
File::from(build_manifest.as_str()).with_content_type(APPLICATION_JAVASCRIPT_UTF_8) File::from(build_manifest.as_str()).with_content_type(APPLICATION_JAVASCRIPT_UTF_8)
} }
"_next/static/development/_devMiddlewareManifest.json" => { "_next/static/development/_devMiddlewareManifest.json" => {
// empty middleware manifest // If there is actual middleware, this request will have been handled by the
// node router in next-core/js/src/entry/router.ts and
// next/src/server/lib/route-resolver.ts.
// If we've reached this point, then there is no middleware and we need to
// respond with an empty `MiddlewareMatcher[]`.
File::from("[]").with_content_type(APPLICATION_JSON) File::from("[]").with_content_type(APPLICATION_JSON)
} }
_ => return Ok(ContentSourceResultVc::not_found()), _ => return Ok(ContentSourceResultVc::not_found()),
......
...@@ -16,7 +16,7 @@ import { getMiddlewareMatchers } from '../../build/analysis/get-page-static-info ...@@ -16,7 +16,7 @@ import { getMiddlewareMatchers } from '../../build/analysis/get-page-static-info
import { getMiddlewareRouteMatcher } from '../../shared/lib/router/utils/middleware-route-matcher' import { getMiddlewareRouteMatcher } from '../../shared/lib/router/utils/middleware-route-matcher'
import { import {
CLIENT_STATIC_FILES_PATH, CLIENT_STATIC_FILES_PATH,
DEV_CLIENT_PAGES_MANIFEST, DEV_MIDDLEWARE_MANIFEST,
} from '../../shared/lib/constants' } from '../../shared/lib/constants'
import type { BaseNextRequest } from '../base-http' import type { BaseNextRequest } from '../base-http'
...@@ -193,20 +193,6 @@ export async function makeResolver( ...@@ -193,20 +193,6 @@ export async function makeResolver(
// @ts-expect-error protected // @ts-expect-error protected
const buildId = devServer.buildId const buildId = devServer.buildId
const pagesManifestRoute = routes.fsRoutes.find(
(r) =>
r.name ===
`_next/${CLIENT_STATIC_FILES_PATH}/${buildId}/${DEV_CLIENT_PAGES_MANIFEST}`
)
if (pagesManifestRoute) {
// make sure turbopack serves this
pagesManifestRoute.fn = () => {
return {
finished: true,
}
}
}
const router = new Router({ const router = new Router({
...routes, ...routes,
catchAllMiddleware, catchAllMiddleware,
...@@ -245,6 +231,8 @@ export async function makeResolver( ...@@ -245,6 +231,8 @@ export async function makeResolver(
route.type === 'header' || route.type === 'header' ||
route.name === 'catchall route' || route.name === 'catchall route' ||
route.name === 'middleware catchall' || route.name === 'middleware catchall' ||
route.name ===
`_next/${CLIENT_STATIC_FILES_PATH}/${buildId}/${DEV_MIDDLEWARE_MANIFEST}` ||
route.name?.includes('check') route.name?.includes('check')
) )
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment