Unverified Commit ceecf912 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Refactor entries generation in hot-reloader (#34733)

* refactor entries generation of hot-reloader

* change parameter name
parent fbb85369
...@@ -117,6 +117,8 @@ export function createEntrypoints( ...@@ -117,6 +117,8 @@ export function createEntrypoints(
Object.keys(config.publicRuntimeConfig).length > 0 || Object.keys(config.publicRuntimeConfig).length > 0 ||
Object.keys(config.serverRuntimeConfig).length > 0 Object.keys(config.serverRuntimeConfig).length > 0
const edgeRuntime = config.experimental.runtime === 'edge'
const defaultServerlessOptions = { const defaultServerlessOptions = {
absoluteAppPath: pages['/_app'], absoluteAppPath: pages['/_app'],
absoluteDocumentPath: pages['/_document'], absoluteDocumentPath: pages['/_document'],
...@@ -157,8 +159,6 @@ export function createEntrypoints( ...@@ -157,8 +159,6 @@ export function createEntrypoints(
const isCustomError = isCustomErrorPage(page) const isCustomError = isCustomErrorPage(page)
const isFlight = isFlightPage(config, absolutePagePath) const isFlight = isFlightPage(config, absolutePagePath)
const edgeRuntime = config.experimental.runtime === 'edge'
if (page.match(MIDDLEWARE_ROUTE)) { if (page.match(MIDDLEWARE_ROUTE)) {
const loaderOpts: MiddlewareLoaderOptions = { const loaderOpts: MiddlewareLoaderOptions = {
absolutePagePath: pages[page], absolutePagePath: pages[page],
......
...@@ -1111,23 +1111,23 @@ export function getRawPageExtensions(pageExtensions: string[]): string[] { ...@@ -1111,23 +1111,23 @@ export function getRawPageExtensions(pageExtensions: string[]): string[] {
export function isFlightPage( export function isFlightPage(
nextConfig: NextConfigComplete, nextConfig: NextConfigComplete,
pagePath: string filePath: string
): boolean { ): boolean {
if ( if (
!( !(
nextConfig.experimental.serverComponents && nextConfig.experimental.serverComponents &&
nextConfig.experimental.runtime nextConfig.experimental.runtime
) )
) ) {
return false return false
}
const rawPageExtensions = getRawPageExtensions( const rawPageExtensions = getRawPageExtensions(
nextConfig.pageExtensions || [] nextConfig.pageExtensions || []
) )
const isRscPage = rawPageExtensions.some((ext) => { return rawPageExtensions.some((ext) => {
return new RegExp(`\\.server\\.${ext}$`).test(pagePath) return filePath.endsWith(`.server.${ext}`)
}) })
return isRscPage
} }
export function getUnresolvedModuleFromError( export function getUnresolvedModuleFromError(
......
...@@ -477,8 +477,6 @@ export default class HotReloader { ...@@ -477,8 +477,6 @@ export default class HotReloader {
return return
} }
const isApiRoute = page.match(API_ROUTE)
if (!isClientCompilation && isMiddleware) { if (!isClientCompilation && isMiddleware) {
return return
} }
...@@ -491,18 +489,15 @@ export default class HotReloader { ...@@ -491,18 +489,15 @@ export default class HotReloader {
return return
} }
const isApiRoute = page.match(API_ROUTE)
const isCustomError = isCustomErrorPage(page) const isCustomError = isCustomErrorPage(page)
const isReserved = isReservedPage(page) const isReserved = isReservedPage(page)
const isServerComponent = const isServerComponent =
this.hasServerComponents && this.hasServerComponents &&
isFlightPage(this.config, absolutePagePath) isFlightPage(this.config, absolutePagePath)
const isEdgeSSRPage = this.runtime === 'edge' && !isApiRoute
if ( if (isNodeServerCompilation && isEdgeSSRPage && !isCustomError) {
isNodeServerCompilation &&
this.runtime === 'edge' &&
!isApiRoute &&
!isCustomError
) {
return return
} }
...@@ -512,29 +507,35 @@ export default class HotReloader { ...@@ -512,29 +507,35 @@ export default class HotReloader {
absolutePagePath, absolutePagePath,
} }
if (isClientCompilation && isMiddleware) { if (isClientCompilation) {
if (isMiddleware) {
// Middleware
entrypoints[bundlePath] = finalizeEntrypoint({ entrypoints[bundlePath] = finalizeEntrypoint({
name: bundlePath, name: bundlePath,
value: `next-middleware-loader?${stringify(pageLoaderOpts)}!`, value: `next-middleware-loader?${stringify(pageLoaderOpts)}!`,
isServer: false, isServer: false,
isMiddleware: true, isMiddleware: true,
}) })
} else if (isClientCompilation) { } else {
// A page route
entrypoints[bundlePath] = finalizeEntrypoint({ entrypoints[bundlePath] = finalizeEntrypoint({
name: bundlePath, name: bundlePath,
value: `next-client-pages-loader?${stringify(pageLoaderOpts)}!`, value: `next-client-pages-loader?${stringify(
pageLoaderOpts
)}!`,
isServer: false, isServer: false,
}) })
// Tell the middleware plugin of the client compilation
// that this route is a page.
if (isEdgeSSRPage) {
if (isServerComponent) { if (isServerComponent) {
ssrEntries.set(bundlePath, { requireFlightManifest: true }) ssrEntries.set(bundlePath, { requireFlightManifest: true })
} else if ( } else if (!isCustomError && !isReserved) {
this.runtime === 'edge' &&
!isReserved &&
!isCustomError
) {
ssrEntries.set(bundlePath, { requireFlightManifest: false }) ssrEntries.set(bundlePath, { requireFlightManifest: false })
} }
}
}
} else if (isEdgeServerCompilation) { } else if (isEdgeServerCompilation) {
if (!isReserved) { if (!isReserved) {
entrypoints[bundlePath] = finalizeEntrypoint({ entrypoints[bundlePath] = finalizeEntrypoint({
...@@ -555,7 +556,7 @@ export default class HotReloader { ...@@ -555,7 +556,7 @@ export default class HotReloader {
isEdgeServer: true, isEdgeServer: true,
}) })
} }
} else { } else if (isNodeServerCompilation) {
let request = relative(config.context!, absolutePagePath) let request = relative(config.context!, absolutePagePath)
if (!isAbsolute(request) && !request.startsWith('../')) { if (!isAbsolute(request) && !request.startsWith('../')) {
request = `./${request}` request = `./${request}`
......
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