Enable default functional document when concurrentFeatures is enabled

vercel · Nov 30, 2021 · 9fa2f30 · 9fa2f30
1 parent 6e6bd21
commit 9fa2f30
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
@@ -25,8 +25,15 @@ export type PagesMapping = {
 export function createPagesMapping(
   pagePaths: string[],
   extensions: string[],
-  isDev: boolean,
-  hasServerComponents: boolean
+  {
+    isDev,
+    hasServerComponents,
+    hasConcurrentFeatures,
+  }: {
+    isDev: boolean
+    hasServerComponents: boolean
+    hasConcurrentFeatures: boolean
+  }
 ): PagesMapping {
   const previousPages: PagesMapping = {}
   const pages: PagesMapping = pagePaths.reduce(
@@ -65,7 +72,7 @@ export function createPagesMapping(
   // we alias these in development and allow webpack to
   // allow falling back to the correct source file so
   // that HMR can work properly when a file is added/removed
-  const documentPage = `_document${hasServerComponents ? '-web' : ''}`
+  const documentPage = `_document${hasConcurrentFeatures ? '-web' : ''}`
   if (isDev) {
     pages['/_app'] = `${PAGES_DIR_ALIAS}/_app`
     pages['/_error'] = `${PAGES_DIR_ALIAS}/_error`

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -281,12 +281,11 @@ export default async function build(
     const mappedPages = nextBuildSpan
       .traceChild('create-pages-mapping')
       .traceFn(() =>
-        createPagesMapping(
-          pagePaths,
-          config.pageExtensions,
-          false,
-          hasServerComponents
-        )
+        createPagesMapping(pagePaths, config.pageExtensions, {
+          isDev: false,
+          hasServerComponents,
+          hasConcurrentFeatures,
+        })
       )
 
     const entrypoints = nextBuildSpan

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -570,7 +570,7 @@ export default async function getBaseWebpackConfig(
         prev.push(path.join(pagesDir, `_document.${ext}`))
         return prev
       }, [] as string[]),
-      `next/dist/pages/_document${hasServerComponents ? '-web' : ''}.js`,
+      `next/dist/pages/_document${webServerRuntime ? '-web' : ''}.js`,
     ]
   }
 

diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
@@ -318,8 +318,11 @@ export default class HotReloader {
           createPagesMapping(
             pagePaths.filter((i) => i !== null) as string[],
             this.config.pageExtensions,
-            true,
-            this.hasServerComponents
+            {
+              isDev: true,
+              hasConcurrentFeatures: this.webServerRuntime,
+              hasServerComponents: this.hasServerComponents,
+            }
           )
         )
 

diff --git a/test/integration/react-18/app/pages/_document.js b/test/integration/react-18/app/pages/_document.js