Unverified Commit 2af6b63d authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Should resolve esm external module imports on server (#40865)

### Issue

When import an esm package in client component, and use it in server
component page, it will fail to SSR but render successfully on client.
It's because the import to esm package will make the client chunk become
an **async module** since esm module will be treated as **async**.

```
page (serve component) -> local module (client) -> external dependency (esm)
```

Then in react SSR layer, it need the module type information of that
chunk, async or not for react so that react could unwrap the async
module from `Promise` properly when SSR.

### Solution

We need to mark the client entries which are effected by async/esm
modules that becoming **async** as `async: true` in SSR manifest.

Since flight manifest plugin is only running against client compiler,
which doesn't have those module information from server compiler. So we
collect the async modules from the **server** compiler **client** layer
from flight entry client plugin, then leverage the collection to detect
if a module is async in flight manifest plugin for react.

## Bug

- [ ] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have a helpful link attached, see `contributing.md`
parent 82682a3a
...@@ -1007,14 +1007,7 @@ export default async function getBaseWebpackConfig( ...@@ -1007,14 +1007,7 @@ export default async function getBaseWebpackConfig(
alias: process.env.__NEXT_REACT_CHANNEL alias: process.env.__NEXT_REACT_CHANNEL
? { ? {
react: `react-${process.env.__NEXT_REACT_CHANNEL}`, react: `react-${process.env.__NEXT_REACT_CHANNEL}`,
'react/package.json': `react-${process.env.__NEXT_REACT_CHANNEL}/package.json`,
'react/jsx-runtime': `react-${process.env.__NEXT_REACT_CHANNEL}/jsx-runtime`,
'react/jsx-dev-runtime': `react-${process.env.__NEXT_REACT_CHANNEL}/jsx-dev-runtime`,
'react-dom': `react-dom-${process.env.__NEXT_REACT_CHANNEL}`, 'react-dom': `react-dom-${process.env.__NEXT_REACT_CHANNEL}`,
'react-dom/package.json': `react-dom-${process.env.__NEXT_REACT_CHANNEL}/package.json`,
'react-dom/server': `react-dom-${process.env.__NEXT_REACT_CHANNEL}/server`,
'react-dom/server.browser': `react-dom-${process.env.__NEXT_REACT_CHANNEL}/server.browser`,
'react-dom/client': `react-dom-${process.env.__NEXT_REACT_CHANNEL}/client`,
} }
: false, : false,
conditionNames: ['react-server'], conditionNames: ['react-server'],
...@@ -1172,10 +1165,10 @@ export default async function getBaseWebpackConfig( ...@@ -1172,10 +1165,10 @@ export default async function getBaseWebpackConfig(
context, context,
request request
) )
return resolved return `${externalType} ${resolved}`
} catch (err) { } catch (err) {
// The `react-server` condition is not matched, fallback.
return return
// The `react-server` condition is not matched, fallback.
} }
} }
......
...@@ -16,7 +16,8 @@ import { ...@@ -16,7 +16,8 @@ import {
COMPILER_NAMES, COMPILER_NAMES,
FLIGHT_SERVER_CSS_MANIFEST, FLIGHT_SERVER_CSS_MANIFEST,
} from '../../../shared/lib/constants' } from '../../../shared/lib/constants'
import { FlightCSSManifest } from './flight-manifest-plugin' import { FlightCSSManifest, traverseModules } from './flight-manifest-plugin'
import { ASYNC_CLIENT_MODULES } from './flight-manifest-plugin'
import { isClientComponentModule } from '../loaders/utils' import { isClientComponentModule } from '../loaders/utils'
interface Options { interface Options {
...@@ -61,6 +62,18 @@ export class FlightClientEntryPlugin { ...@@ -61,6 +62,18 @@ export class FlightClientEntryPlugin {
compiler.hooks.finishMake.tapPromise(PLUGIN_NAME, (compilation) => { compiler.hooks.finishMake.tapPromise(PLUGIN_NAME, (compilation) => {
return this.createClientEntries(compiler, compilation) return this.createClientEntries(compiler, compilation)
}) })
compiler.hooks.afterCompile.tap(PLUGIN_NAME, (compilation) => {
traverseModules(compilation, (mod) => {
// The module must has request, and resource so it's not a new entry created with loader.
// Using the client layer module, which doesn't have `rsc` tag in buildInfo.
if (mod.request && mod.resource && !mod.buildInfo.rsc) {
if (compilation.moduleGraph.isAsync(mod)) {
ASYNC_CLIENT_MODULES.add(mod.resource)
}
}
})
})
} }
async createClientEntries(compiler: any, compilation: any) { async createClientEntries(compiler: any, compilation: any) {
...@@ -372,6 +385,7 @@ export class FlightClientEntryPlugin { ...@@ -372,6 +385,7 @@ export class FlightClientEntryPlugin {
compilation.hooks.failedEntry.call(entry, options, err) compilation.hooks.failedEntry.call(entry, options, err)
return reject(err) return reject(err)
} }
compilation.hooks.succeedEntry.call(entry, options, module) compilation.hooks.succeedEntry.call(entry, options, module)
return resolve(module) return resolve(module)
} }
......
...@@ -43,6 +43,11 @@ interface ManifestNode { ...@@ -43,6 +43,11 @@ interface ManifestNode {
* Chunks for the module. JS and CSS. * Chunks for the module. JS and CSS.
*/ */
chunks: ManifestChunks chunks: ManifestChunks
/**
* If chunk contains async module
*/
async?: boolean
} }
} }
...@@ -60,6 +65,37 @@ export type FlightCSSManifest = { ...@@ -60,6 +65,37 @@ export type FlightCSSManifest = {
const PLUGIN_NAME = 'FlightManifestPlugin' const PLUGIN_NAME = 'FlightManifestPlugin'
// Collect modules from server/edge compiler in client layer,
// and detect if it's been used, and mark it as `async: true` for react.
// So that react could unwrap the async module from promise and render module itself.
export const ASYNC_CLIENT_MODULES = new Set<string>()
export function traverseModules(
compilation: webpack.Compilation,
callback: (
mod: any,
chunk: webpack.Chunk,
chunkGroup: typeof compilation.chunkGroups[0]
) => any
) {
compilation.chunkGroups.forEach((chunkGroup) => {
chunkGroup.chunks.forEach((chunk: webpack.Chunk) => {
const chunkModules = compilation.chunkGraph.getChunkModulesIterable(
chunk
// TODO: Update type so that it doesn't have to be cast.
) as Iterable<webpack.NormalModule>
for (const mod of chunkModules) {
callback(mod, chunk, chunkGroup)
const anyModule = mod as any
if (anyModule.modules) {
for (const subMod of anyModule.modules)
callback(subMod, chunk, chunkGroup)
}
}
})
})
}
export class FlightManifestPlugin { export class FlightManifestPlugin {
dev: Options['dev'] = false dev: Options['dev'] = false
...@@ -117,21 +153,7 @@ export class FlightManifestPlugin { ...@@ -117,21 +153,7 @@ export class FlightManifestPlugin {
} }
} }
compilation.chunkGroups.forEach((chunkGroup) => { traverseModules(compilation, (mod) => collectClientRequest(mod))
chunkGroup.chunks.forEach((chunk: webpack.Chunk) => {
const chunkModules = compilation.chunkGraph.getChunkModulesIterable(
chunk
// TODO: Update type so that it doesn't have to be cast.
) as Iterable<webpack.NormalModule>
for (const mod of chunkModules) {
collectClientRequest(mod)
const anyModule = mod as any
if (anyModule.modules) {
for (const subMod of anyModule.modules) collectClientRequest(subMod)
}
}
})
})
compilation.chunkGroups.forEach((chunkGroup) => { compilation.chunkGroups.forEach((chunkGroup) => {
const cssResourcesInChunkGroup = new Set<string>() const cssResourcesInChunkGroup = new Set<string>()
...@@ -208,6 +230,8 @@ export class FlightManifestPlugin { ...@@ -208,6 +230,8 @@ export class FlightManifestPlugin {
} }
const exportsInfo = compilation.moduleGraph.getExportsInfo(mod) const exportsInfo = compilation.moduleGraph.getExportsInfo(mod)
const isAsyncModule = ASYNC_CLIENT_MODULES.has(mod.resource)
const cjsExports = [ const cjsExports = [
...new Set([ ...new Set([
...mod.dependencies.map((dep) => { ...mod.dependencies.map((dep) => {
...@@ -260,6 +284,10 @@ export class FlightManifestPlugin { ...@@ -260,6 +284,10 @@ export class FlightManifestPlugin {
id, id,
name, name,
chunks: requiredChunks, chunks: requiredChunks,
// E.g.
// page (server) -> local module (client) -> package (esm)
// The esm package will bubble up to make the entire chain till the client entry as async module.
async: isAsyncModule,
} }
} }
...@@ -305,6 +333,8 @@ export class FlightManifestPlugin { ...@@ -305,6 +333,8 @@ export class FlightManifestPlugin {
const file = 'server/' + FLIGHT_MANIFEST const file = 'server/' + FLIGHT_MANIFEST
const json = JSON.stringify(manifest) const json = JSON.stringify(manifest)
ASYNC_CLIENT_MODULES.clear()
assets[file + '.js'] = new sources.RawSource( assets[file + '.js'] = new sources.RawSource(
'self.__RSC_MANIFEST=' + json 'self.__RSC_MANIFEST=' + json
// Work around webpack 4 type of RawSource being used // Work around webpack 4 type of RawSource being used
......
...@@ -74,12 +74,10 @@ describe('app dir - react server components', () => { ...@@ -74,12 +74,10 @@ describe('app dir - react server components', () => {
// should have only 1 DOCTYPE // should have only 1 DOCTYPE
expect(homeHTML).toMatch(/^<!DOCTYPE html><html/) expect(homeHTML).toMatch(/^<!DOCTYPE html><html/)
// TODO: support next/head
// expect(homeHTML).toMatch('<meta name="rsc-title" content="index"/>')
expect(homeHTML).toContain('component:index.server') expect(homeHTML).toContain('component:index.server')
// TODO: support env
// expect(homeHTML).toContain('env:env_var_test')
expect(homeHTML).toContain('header:test-util') expect(homeHTML).toContain('header:test-util')
// support esm module on server side
expect(homeHTML).toContain('random-module-instance')
const inlineFlightContents = [] const inlineFlightContents = []
const $ = cheerio.load(homeHTML) const $ = cheerio.load(homeHTML)
...@@ -134,26 +132,6 @@ describe('app dir - react server components', () => { ...@@ -134,26 +132,6 @@ describe('app dir - react server components', () => {
expect(html).toContain('foo.client') expect(html).toContain('foo.client')
}) })
it('should resolve different kinds of components correctly', async () => {
const html = await renderViaHTTP(next.url, '/shared')
const main = getNodeBySelector(html, '#main').html()
// Should have 5 occurrences of "client_component".
expect(Array.from(main.matchAll(/client_component/g)).length).toBe(5)
// Should have 2 occurrences of "shared:server", and 2 occurrences of
// "shared:client".
const sharedServerModule = Array.from(main.matchAll(/shared:server:(\d+)/g))
const sharedClientModule = Array.from(main.matchAll(/shared:client:(\d+)/g))
expect(sharedServerModule.length).toBe(2)
expect(sharedClientModule.length).toBe(2)
// Should have 2 modules created for the shared component.
expect(sharedServerModule[0][1]).toBe(sharedServerModule[1][1])
expect(sharedClientModule[0][1]).toBe(sharedClientModule[1][1])
expect(sharedServerModule[0][1]).not.toBe(sharedClientModule[0][1])
})
it('should be able to navigate between rsc routes', async () => { it('should be able to navigate between rsc routes', async () => {
const browser = await webdriver(next.url, '/root') const browser = await webdriver(next.url, '/root')
...@@ -304,10 +282,25 @@ describe('app dir - react server components', () => { ...@@ -304,10 +282,25 @@ describe('app dir - react server components', () => {
expect(content).toContain('foo.client') expect(content).toContain('foo.client')
}) })
it('should support the re-export syntax in server component', async () => { it('should resolve different kinds of components correctly', async () => {
const html = await renderViaHTTP(next.url, '/shared') const html = await renderViaHTTP(next.url, '/shared')
const main = getNodeBySelector(html, '#main').html()
const content = getNodeBySelector(html, '#bar').text() const content = getNodeBySelector(html, '#bar').text()
// Should have 5 occurrences of "client_component".
expect(Array.from(main.matchAll(/client_component/g)).length).toBe(5)
// Should have 2 occurrences of "shared:server", and 2 occurrences of
// "shared:client".
const sharedServerModule = Array.from(main.matchAll(/shared:server:(\d+)/g))
const sharedClientModule = Array.from(main.matchAll(/shared:client:(\d+)/g))
expect(sharedServerModule.length).toBe(2)
expect(sharedClientModule.length).toBe(2)
// Should have 2 modules created for the shared component.
expect(sharedServerModule[0][1]).toBe(sharedServerModule[1][1])
expect(sharedClientModule[0][1]).toBe(sharedClientModule[1][1])
expect(sharedServerModule[0][1]).not.toBe(sharedClientModule[0][1])
expect(content).toContain('bar.server.js:') expect(content).toContain('bar.server.js:')
}) })
......
import Nav from '../components/nav' import Nav from '../components/nav'
import { headers } from 'next/dist/client/components/hooks-server' import { headers } from 'next/dist/client/components/hooks-server'
import { name } from 'random-module-instance'
const envVar = process.env.ENV_VAR_TEST const envVar = process.env.ENV_VAR_TEST
const headerKey = 'x-next-test-client' const headerKey = 'x-next-test-client'
export default function Index(props) { export default function Index() {
const headersList = headers() const headersList = headers()
const header = headersList.get(headerKey) const header = headersList.get(headerKey)
...@@ -13,6 +14,7 @@ export default function Index(props) { ...@@ -13,6 +14,7 @@ export default function Index(props) {
<h1>{`component:index.server`}</h1> <h1>{`component:index.server`}</h1>
<div>{'env:' + envVar}</div> <div>{'env:' + envVar}</div>
<div>{'header:' + header}</div> <div>{'header:' + header}</div>
<p>{name}</p>
<Nav /> <Nav />
</div> </div>
) )
......
...@@ -14,7 +14,6 @@ export default function Page() { ...@@ -14,7 +14,6 @@ export default function Page() {
<div id="main" suppressHydrationWarning> <div id="main" suppressHydrationWarning>
<Random /> <Random />
<br /> <br />
<br />
<ClientFromDirect /> <ClientFromDirect />
<br /> <br />
<ClientFromShared /> <ClientFromShared />
......
exports.random = ~~(Math.random() * 1e5) export const random = ~~(Math.random() * 1e5)
export const name = 'random-module-instance'
{ {
"name": "random-module-instance", "name": "random-module-instance",
"main": "./index.js" "type": "module",
"exports": "./index.js"
} }
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