Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize the SSR middleware runtime size #30906

Merged
merged 8 commits into from Nov 5, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions packages/next/server/react-dom-server.ts
@@ -0,0 +1,13 @@
let ReactDOMServer: typeof import('react-dom/server')

if (process.browser) {
if (process.env.NODE_ENV === 'production') {
ReactDOMServer = require('react-dom/cjs/react-dom-server.browser.production.min')
} else {
ReactDOMServer = require('react-dom/cjs/react-dom-server.browser.development')
}
} else {
ReactDOMServer = require('react-dom/server')
}

export default ReactDOMServer
shuding marked this conversation as resolved.
Show resolved Hide resolved
36 changes: 33 additions & 3 deletions packages/next/server/render.tsx
Expand Up @@ -2,7 +2,7 @@ import { IncomingMessage, ServerResponse } from 'http'
import { ParsedUrlQuery } from 'querystring'
import type { Writable as WritableType } from 'stream'
import React from 'react'
import * as ReactDOMServer from 'react-dom/server'
import ReactDOMServer from './react-dom-server'
import { StyleRegistry, createStyleRegistry } from 'styled-jsx'
import { UnwrapPromise } from '../lib/coalesced-function'
import {
Expand Down Expand Up @@ -950,7 +950,12 @@ export async function renderToHTML(
*/
const generateStaticHTML = supportsDynamicHTML !== true
const renderDocument = async () => {
if (Document.getInitialProps) {
if (process.browser && Document.getInitialProps) {
throw new Error(
'`getInitialProps` in Document component is not supported with `concurrentFeatures` enabled.'
)
}
if (!process.browser && Document.getInitialProps) {
const renderPage: RenderPage = (
options: ComponentsEnhancer = {}
): RenderPageResult | Promise<RenderPageResult> => {
Expand Down Expand Up @@ -1120,14 +1125,39 @@ export async function renderToHTML(
styles: documentResult.styles,
useMaybeDeferContent,
}
const documentHTML = ReactDOMServer.renderToStaticMarkup(

const document = (
<AmpStateContext.Provider value={ampState}>
<HtmlContext.Provider value={htmlProps}>
{documentResult.documentElement(htmlProps)}
</HtmlContext.Provider>
</AmpStateContext.Provider>
)

let documentHTML: string
if (process.browser) {
// There is no `renderToStaticMarkup` exposed in the web environment, use
// blocking `renderToReadableStream` to get the similar result.
let result = ''
const readable = (ReactDOMServer as any).renderToReadableStream(document, {
onError: (err: any) => {
throw err
},
})
const reader = readable.getReader()
const decoder = new TextDecoder()
while (true) {
const { done, value } = await reader.read()
if (done) {
break
}
result += typeof value === 'string' ? value : decoder.decode(value)
}
documentHTML = result
} else {
documentHTML = ReactDOMServer.renderToStaticMarkup(document)
}

if (process.env.NODE_ENV !== 'production') {
const nonRenderedComponents = []
const expectedDocComponents = ['Main', 'Head', 'NextScript', 'Html']
Expand Down