expose defaultGetInitialProps on DocumentContext

vercel · Sep 2, 2021 · a0ea060 · a0ea060
1 parent 9a4681e
commit a0ea060
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
@@ -165,16 +165,8 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
    * `getInitialProps` hook returns the context object with the addition of `renderPage`.
    * `renderPage` callback executes `React` rendering logic synchronously to support server-rendering wrappers
    */
-  static async getInitialProps(
-    ctx: DocumentContext
-  ): Promise<DocumentInitialProps> {
-    const enhanceApp = (App: any) => {
-      return (props: any) => <App {...props} />
-    }
-
-    const { html, head } = await ctx.renderPage({ enhanceApp })
-    const styles = ctx.jsxStyleRegistry.styles()
-    return { html, head, styles }
+  static getInitialProps(ctx: DocumentContext): Promise<DocumentInitialProps> {
+    return ctx.defaultGetInitialProps(ctx)
   }
 
   render() {

diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -40,6 +40,7 @@ import {
   ComponentsEnhancer,
   DocumentInitialProps,
   DocumentProps,
+  DocumentContext,
   HtmlContext,
   HtmlProps,
   getDisplayName,
@@ -482,6 +483,7 @@ export async function renderToHTML(
     isPreview,
     (req as any).__nextIsLocaleDomain
   )
+  const jsxStyleRegistry = createStyleRegistry()
   const ctx = {
     err,
     req: isAutoExport ? undefined : req,
@@ -499,7 +501,17 @@ export async function renderToHTML(
         </AppContainer>
       )
     },
-    jsxStyleRegistry: createStyleRegistry(),
+    defaultGetInitialProps: async (
+      docCtx: DocumentContext
+    ): Promise<DocumentInitialProps> => {
+      const enhanceApp = (AppComp: any) => {
+        return (props: any) => <AppComp {...props} />
+      }
+
+      const { html, head } = await docCtx.renderPage({ enhanceApp })
+      const styles = jsxStyleRegistry.styles()
+      return { html, head, styles }
+    },
   }
   let props: any
 
@@ -537,7 +549,7 @@ export async function renderToHTML(
           <LoadableContext.Provider
             value={(moduleName) => reactLoadableModules.push(moduleName)}
           >
-            <StyleRegistry registry={ctx.jsxStyleRegistry}>
+            <StyleRegistry registry={jsxStyleRegistry}>
               {children}
             </StyleRegistry>
           </LoadableContext.Provider>
@@ -1008,7 +1020,7 @@ export async function renderToHTML(
         documentElement: () => (Document as any)(),
         head,
         headTags: [],
-        styles: ctx.jsxStyleRegistry.styles(),
+        styles: jsxStyleRegistry.styles(),
       }
     }
   }

diff --git a/packages/next/shared/lib/utils.ts b/packages/next/shared/lib/utils.ts
@@ -9,7 +9,6 @@ import type { ParsedUrlQuery } from 'querystring'
 import type { PreviewData } from 'next/types'
 import type { UrlObject } from 'url'
 import { createContext } from 'react'
-import { StyleRegistry } from 'styled-jsx'
 
 export type NextComponentType<
   C extends BaseContext = NextPageContext,
@@ -179,7 +178,7 @@ export type AppPropsType<
 
 export type DocumentContext = NextPageContext & {
   renderPage: RenderPage
-  jsxStyleRegistry: StyleRegistry
+  defaultGetInitialProps(ctx: DocumentContext): Promise<DocumentInitialProps>
 }
 
 export type DocumentInitialProps = RenderPageResult & {