Unverified Commit 0307ba0d authored by Shu Ding's avatar Shu Ding Committed by GitHub

Optimize the SSR middleware runtime size (#30906)

By conditionally importing `react-dom/server` under the web runtime and reusing `renderToReadableStream` instead of `renderToStaticMarkup`, we can get rid of the legacy browser React DOM server from the runtime. ~Furthermore we can make the build target `es6` for the SSR middleware, and make some code paths tree-shakable (done in another PR).~

Together this makes the runtime ~32kb smaller.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`
parent 6e081e17
...@@ -676,6 +676,14 @@ export default async function getBaseWebpackConfig( ...@@ -676,6 +676,14 @@ export default async function getBaseWebpackConfig(
false, false,
} }
: {}), : {}),
...(webServerRuntime
? {
'react-dom/server': dev
? 'react-dom/cjs/react-dom-server.browser.development'
: 'react-dom/cjs/react-dom-server.browser.production.min',
}
: {}),
}, },
...(targetWeb ...(targetWeb
? { ? {
......
...@@ -2,7 +2,7 @@ import { IncomingMessage, ServerResponse } from 'http' ...@@ -2,7 +2,7 @@ import { IncomingMessage, ServerResponse } from 'http'
import { ParsedUrlQuery } from 'querystring' import { ParsedUrlQuery } from 'querystring'
import type { Writable as WritableType } from 'stream' import type { Writable as WritableType } from 'stream'
import React from 'react' import React from 'react'
import * as ReactDOMServer from 'react-dom/server' import ReactDOMServer from 'react-dom/server'
import { StyleRegistry, createStyleRegistry } from 'styled-jsx' import { StyleRegistry, createStyleRegistry } from 'styled-jsx'
import { UnwrapPromise } from '../lib/coalesced-function' import { UnwrapPromise } from '../lib/coalesced-function'
import { import {
...@@ -950,7 +950,12 @@ export async function renderToHTML( ...@@ -950,7 +950,12 @@ export async function renderToHTML(
*/ */
const generateStaticHTML = supportsDynamicHTML !== true const generateStaticHTML = supportsDynamicHTML !== true
const renderDocument = async () => { 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 = ( const renderPage: RenderPage = (
options: ComponentsEnhancer = {} options: ComponentsEnhancer = {}
): RenderPageResult | Promise<RenderPageResult> => { ): RenderPageResult | Promise<RenderPageResult> => {
...@@ -1120,7 +1125,8 @@ export async function renderToHTML( ...@@ -1120,7 +1125,8 @@ export async function renderToHTML(
styles: documentResult.styles, styles: documentResult.styles,
useMaybeDeferContent, useMaybeDeferContent,
} }
const documentHTML = ReactDOMServer.renderToStaticMarkup(
const document = (
<AmpStateContext.Provider value={ampState}> <AmpStateContext.Provider value={ampState}>
<HtmlContext.Provider value={htmlProps}> <HtmlContext.Provider value={htmlProps}>
{documentResult.documentElement(htmlProps)} {documentResult.documentElement(htmlProps)}
...@@ -1128,6 +1134,30 @@ export async function renderToHTML( ...@@ -1128,6 +1134,30 @@ export async function renderToHTML(
</AmpStateContext.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: (e: any) => {
throw e
},
})
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') { if (process.env.NODE_ENV !== 'production') {
const nonRenderedComponents = [] const nonRenderedComponents = []
const expectedDocComponents = ['Main', 'Head', 'NextScript', 'Html'] const expectedDocComponents = ['Main', 'Head', 'NextScript', 'Html']
......
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