feat: add draft mode to next/headers (#48789)

fix NEXT-1003 Co-authored-by: Wyatt Johnson <633002+wyattjoh@users.noreply.github.com>
vercel · May 1, 2023 · 58e5c78 · 58e5c78
1 parent d23b160
commit 58e5c78
Show file tree

Hide file tree

Showing 40 changed files with 503 additions and 432 deletions.
diff --git a/packages/next-swc/crates/next-core/js/src/entry/app/route.ts b/packages/next-swc/crates/next-core/js/src/entry/app/route.ts
@@ -36,6 +36,15 @@ startHandler(async ({ request, response, query, params, path }) => {
 
   const context: RouteHandlerManagerContext = {
     params,
+    prerenderManifest: {
+      version: -1 as any, // letting us know this doesn't conform to spec
+      routes: {},
+      dynamicRoutes: {},
+      notFoundRoutes: [],
+      preview: {
+        previewModeId: 'development-id',
+      } as any,
+    },
     staticGenerationContext: {
       supportsDynamicHTML: true,
     },

diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-334728.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-334728.txt
diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-34ee13.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-34ee13.txt
diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-393c11.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-393c11.txt
diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-4d3572.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-4d3572.txt
diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-b48125.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-b48125.txt
diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-c01485.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-c01485.txt
diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-d1c759.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-d1c759.txt
diff --git a/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-f5d5e4.txt b/...tests/tests/integration/next/app/route/issues/Error resolving commonjs request-f5d5e4.txt
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -2833,6 +2833,11 @@ export default async function build(
           JSON.stringify(prerenderManifest),
           'utf8'
         )
+        await promises.writeFile(
+          path.join(distDir, PRERENDER_MANIFEST).replace(/\.json$/, '.js'),
+          `self.__PRERENDER_MANIFEST=${JSON.stringify(prerenderManifest)}`,
+          'utf8'
+        )
         await generateClientSsgManifest(prerenderManifest, {
           distDir,
           buildId,
@@ -2851,6 +2856,11 @@ export default async function build(
           JSON.stringify(prerenderManifest),
           'utf8'
         )
+        await promises.writeFile(
+          path.join(distDir, PRERENDER_MANIFEST).replace(/\.json$/, '.js'),
+          `self.__PRERENDER_MANIFEST=${JSON.stringify(prerenderManifest)}`,
+          'utf8'
+        )
       }
 
       const images = { ...config.images }

diff --git a/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts b/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts
@@ -134,6 +134,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
     }
 
     const buildManifest = self.__BUILD_MANIFEST
+    const prerenderManifest = self.__PRERENDER_MANIFEST
     const reactLoadableManifest = self.__REACT_LOADABLE_MANIFEST
     const rscManifest = self.__RSC_MANIFEST
     const rscCssManifest = self.__RSC_CSS_MANIFEST
@@ -153,6 +154,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
       error500Mod,
       Document,
       buildManifest,
+      prerenderManifest,
       appRenderToHTML,
       pagesRenderToHTML,
       reactLoadableManifest,

diff --git a/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/render.ts b/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/render.ts
@@ -12,6 +12,7 @@ import {
   WebNextResponse,
 } from '../../../../server/base-http/web'
 import { SERVER_RUNTIME } from '../../../../lib/constants'
+import { PrerenderManifest } from '../../..'
 
 export function getRender({
   dev,
@@ -23,6 +24,7 @@ export function getRender({
   pagesType,
   Document,
   buildManifest,
+  prerenderManifest,
   reactLoadableManifest,
   appRenderToHTML,
   pagesRenderToHTML,
@@ -46,6 +48,7 @@ export function getRender({
   pagesRenderToHTML: any
   Document: DocumentType
   buildManifest: BuildManifest
+  prerenderManifest: PrerenderManifest
   reactLoadableManifest: ReactLoadableManifest
   subresourceIntegrityManifest?: Record<string, string>
   clientReferenceManifest?: ClientReferenceManifest
@@ -61,6 +64,7 @@ export function getRender({
   const baseLoadComponentResult = {
     dev,
     buildManifest,
+    prerenderManifest,
     reactLoadableManifest,
     subresourceIntegrityManifest,
     nextFontManifest,
@@ -75,6 +79,7 @@ export function getRender({
     webServerConfig: {
       page,
       pagesType,
+      prerenderManifest,
       extendRenderOpts: {
         buildId,
         runtime: SERVER_RUNTIME.experimentalEdge,