Unverified Commit a1abeaf6 authored by Justin Ridgewell's avatar Justin Ridgewell Committed by GitHub
parent 0ab8dcb0
This diff is collapsed.
......@@ -19,7 +19,7 @@ serde = "1"
serde_json = "1"
tracing = { version = "0.1.37", features = ["release_max_level_info"] }
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230217.2", features = [
"__swc_core",
"__swc_core_next_core",
"__swc_transform_styled_jsx",
......@@ -29,7 +29,7 @@ next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-2
] }
[dev-dependencies]
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230217.2", features = [
"__swc_core_testing_transform",
"__swc_testing",
] }
......
......@@ -39,10 +39,10 @@ tracing = { version = "0.1.37", features = ["release_max_level_info"] }
tracing-futures = "0.2.5"
tracing-subscriber = "0.3.9"
tracing-chrome = "0.5.0"
turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2" }
turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2" }
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230217.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230217.2" }
turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230217.2" }
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230217.2", features = [
"__swc_core_binding_napi",
"__turbo_next_dev_server",
"__turbo_node_file_trace",
......
......@@ -31,7 +31,7 @@ wasm-bindgen-futures = "0.4.8"
getrandom = { version = "0.2.5", optional = true, default-features = false }
js-sys = "0.3.59"
serde-wasm-bindgen = "0.4.3"
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230217.2", features = [
"__swc_core_binding_wasm",
"__feature_mdx_rs",
] }
......
......@@ -238,7 +238,7 @@ export default class DevServer extends Server {
const ensurer: RouteEnsurer = {
ensure: async (match) => {
await this.hotReloader!.ensurePage({
await this.hotReloader?.ensurePage({
match,
page: match.definition.page,
clientOnly: false,
......@@ -726,7 +726,7 @@ export default class DevServer extends Server {
!this.sortedRoutes?.every((val, idx) => val === sortedRoutes[idx])
) {
// emit the change so clients fetch the update
this.hotReloader!.send(undefined, { devPagesManifest: true })
this.hotReloader?.send(undefined, { devPagesManifest: true })
}
this.sortedRoutes = sortedRoutes
......@@ -1118,11 +1118,12 @@ export default class DevServer extends Server {
}
}
const { finished = false } = await this.hotReloader!.run(
req.originalRequest,
res.originalResponse,
parsedUrl
)
const { finished = false } =
(await this.hotReloader?.run(
req.originalRequest,
res.originalResponse,
parsedUrl
)) || {}
if (finished) {
return
......@@ -1319,7 +1320,7 @@ export default class DevServer extends Server {
}
protected async ensureMiddleware() {
return this.hotReloader!.ensurePage({
return this.hotReloader?.ensurePage({
page: this.actualMiddlewareFile!,
clientOnly: false,
})
......@@ -1348,7 +1349,7 @@ export default class DevServer extends Server {
page: string
appPaths: string[] | null
}) {
return this.hotReloader!.ensurePage({ page, appPaths, clientOnly: false })
return this.hotReloader?.ensurePage({ page, appPaths, clientOnly: false })
}
generateRoutes() {
......@@ -1553,7 +1554,7 @@ export default class DevServer extends Server {
}
try {
if (shouldEnsure || this.renderOpts.customServer) {
await this.hotReloader!.ensurePage({
await this.hotReloader?.ensurePage({
page: pathname,
appPaths,
clientOnly: false,
......@@ -1588,10 +1589,10 @@ export default class DevServer extends Server {
}
protected async getFallbackErrorComponents(): Promise<LoadComponentsReturnType | null> {
await this.hotReloader!.buildFallbackError()
await this.hotReloader?.buildFallbackError()
// Build the error page to ensure the fallback is built too.
// TODO: See if this can be moved into hotReloader or removed.
await this.hotReloader!.ensurePage({ page: '/_error', clientOnly: false })
await this.hotReloader?.ensurePage({ page: '/_error', clientOnly: false })
return await loadDefaultErrorComponents(this.distDir)
}
......@@ -1618,7 +1619,7 @@ export default class DevServer extends Server {
}
async getCompilationError(page: string): Promise<any> {
const errors = await this.hotReloader!.getCompilationErrors(page)
const errors = (await this.hotReloader?.getCompilationErrors(page)) || []
if (errors.length === 0) return
// Return the very first error we found.
......
import type { IncomingMessage, ServerResponse } from 'http'
import type { UnwrapPromise } from '../../lib/coalesced-function'
import type { NextConfig } from '../config'
import type { Route } from '../router'
......@@ -31,52 +30,49 @@ export async function makeResolver(dir: string, nextConfig: NextConfig) {
const devServer = new DevServer({
dir,
conf: nextConfig,
}) as any as {
customRoutes: UnwrapPromise<ReturnType<typeof loadCustomRoutes>>
router: InstanceType<typeof Router>
generateRoutes: any
}
})
await devServer.startWatcher.bind(devServer)()
// @ts-expect-error
devServer.customRoutes = await loadCustomRoutes(nextConfig)
const routes = devServer.generateRoutes.bind(devServer)()
devServer.router = new Router(routes)
const routeResults = new Map<string, string>()
// @ts-expect-error internal field
devServer.router.catchAllRoute = {
match: getPathMatch('/:path*'),
name: 'catchall route',
fn: async (req, _res, _params, parsedUrl) => {
// clean up internal query values
for (const key of Object.keys(parsedUrl.query || {})) {
if (key.startsWith('_next')) {
delete parsedUrl.query[key]
const routeResults = new WeakMap<any, string>()
const routes = devServer.generateRoutes.bind(devServer)()
const router = new Router({
...routes,
catchAllRoute: {
match: getPathMatch('/:path*'),
name: 'catchall route',
fn: async (req, _res, _params, parsedUrl) => {
// clean up internal query values
for (const key of Object.keys(parsedUrl.query || {})) {
if (key.startsWith('_next')) {
delete parsedUrl.query[key]
}
}
}
routeResults.set(
(req as any)._initUrl,
url.format({
pathname: parsedUrl.pathname,
query: parsedUrl.query,
hash: parsedUrl.hash,
})
)
return { finished: true }
},
} as Route
routeResults.set(
req,
url.format({
pathname: parsedUrl.pathname,
query: parsedUrl.query,
hash: parsedUrl.hash,
})
)
return { finished: true }
},
} as Route,
})
// @ts-expect-error internal field
devServer.router.compiledRoutes = devServer.router.compiledRoutes.filter(
(route: Route) => {
return (
route.type === 'rewrite' ||
route.type === 'redirect' ||
route.type === 'header' ||
route.name === 'catchall route' ||
route.name?.includes('check')
)
}
)
router.compiledRoutes = router.compiledRoutes.filter((route: Route) => {
const matches =
route.type === 'rewrite' ||
route.type === 'redirect' ||
route.type === 'header' ||
route.name === 'catchall route' ||
route.name?.includes('check')
return matches
})
return async function resolveRoute(
_req: IncomingMessage,
......@@ -86,15 +82,12 @@ export async function makeResolver(dir: string, nextConfig: NextConfig) {
const res = new NodeNextResponse(_res)
;(req as any)._initUrl = req.url
await devServer.router.execute.bind(devServer.router)(
req,
res,
url.parse(req.url!, true)
)
await router.execute.bind(router)(req, res, url.parse(req.url!, true))
if (!res.originalResponse.headersSent) {
res.setHeader('x-nextjs-route-result', '1')
const resolvedUrl = routeResults.get((req as any)._initUrl)
const resolvedUrl = routeResults.get(req)
routeResults.delete(req)
const routeResult: RouteResult =
resolvedUrl == null
......
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