Unverified Commit 1405eaf4 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Built-in flight plugin for additional bundler (#76014)

Adds support for a built-in Rspack Flight Client Entry Plugin implementation alongside the existing webpack version.

Ported from https://github.com/vercel/next.js/tree/wbinnssmith/try-ci-test, originally by @hardfist.

- Introduces a new `RspackFlightClientEntryPlugin` class that wraps Rspack's built-in Flight Client Entry Plugin
- Conditionally uses either the Rspack or webpack implementation based on environment flags
parent b32b656a
...@@ -47,7 +47,8 @@ import { WellKnownErrorsPlugin } from './webpack/plugins/wellknown-errors-plugin ...@@ -47,7 +47,8 @@ import { WellKnownErrorsPlugin } from './webpack/plugins/wellknown-errors-plugin
import { regexLikeCss } from './webpack/config/blocks/css' import { regexLikeCss } from './webpack/config/blocks/css'
import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin' import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin'
import { ClientReferenceManifestPlugin } from './webpack/plugins/flight-manifest-plugin' import { ClientReferenceManifestPlugin } from './webpack/plugins/flight-manifest-plugin'
import { FlightClientEntryPlugin } from './webpack/plugins/flight-client-entry-plugin' import { FlightClientEntryPlugin as NextFlightClientEntryPlugin } from './webpack/plugins/flight-client-entry-plugin'
import { RspackFlightClientEntryPlugin } from './webpack/plugins/rspack-flight-client-entry-plugin'
import { NextTypesPlugin } from './webpack/plugins/next-types-plugin' import { NextTypesPlugin } from './webpack/plugins/next-types-plugin'
import type { import type {
Feature, Feature,
...@@ -344,6 +345,11 @@ export default async function getBaseWebpackConfig( ...@@ -344,6 +345,11 @@ export default async function getBaseWebpackConfig(
const isRspack = Boolean(process.env.NEXT_RSPACK) const isRspack = Boolean(process.env.NEXT_RSPACK)
const FlightClientEntryPlugin =
isRspack && process.env.BUILTIN_FLIGHT_CLIENT_ENTRY_PLUGIN
? RspackFlightClientEntryPlugin
: NextFlightClientEntryPlugin
// If the current compilation is aimed at server-side code instead of client-side code. // If the current compilation is aimed at server-side code instead of client-side code.
const isNodeOrEdgeCompilation = isNodeServer || isEdgeServer const isNodeOrEdgeCompilation = isNodeServer || isEdgeServer
......
...@@ -64,6 +64,13 @@ export default function transformSource( ...@@ -64,6 +64,13 @@ export default function transformSource(
buildInfo.rsc = { buildInfo.rsc = {
type: RSC_MODULE_TYPES.client, type: RSC_MODULE_TYPES.client,
} }
if (process.env.BUILTIN_FLIGHT_CLIENT_ENTRY_PLUGIN) {
const rscModuleInformationJson = JSON.stringify(buildInfo.rsc)
return (
`/* __rspack_internal_rsc_module_information_do_not_use__ ${rscModuleInformationJson} */\n` +
code
)
}
return code return code
} }
...@@ -15,6 +15,12 @@ const flightClientModuleLoader: webpack.LoaderDefinitionFunction = ...@@ -15,6 +15,12 @@ const flightClientModuleLoader: webpack.LoaderDefinitionFunction =
// Assign the RSC meta information to buildInfo. // Assign the RSC meta information to buildInfo.
const buildInfo = getModuleBuildInfo(this._module) const buildInfo = getModuleBuildInfo(this._module)
buildInfo.rsc = getRSCModuleInformation(source, false) buildInfo.rsc = getRSCModuleInformation(source, false)
let prefix = ''
if (process.env.BUILTIN_FLIGHT_CLIENT_ENTRY_PLUGIN) {
const rscModuleInformationJson = JSON.stringify(buildInfo.rsc)
prefix = `/* __rspack_internal_rsc_module_information_do_not_use__ ${rscModuleInformationJson} */\n`
source = prefix + source
}
// This is a server action entry module in the client layer. We need to // This is a server action entry module in the client layer. We need to
// create re-exports of "virtual modules" to expose the reference IDs to the // create re-exports of "virtual modules" to expose the reference IDs to the
...@@ -23,11 +29,14 @@ const flightClientModuleLoader: webpack.LoaderDefinitionFunction = ...@@ -23,11 +29,14 @@ const flightClientModuleLoader: webpack.LoaderDefinitionFunction =
// production mode. In development mode, we want to preserve the original // production mode. In development mode, we want to preserve the original
// modules (as transformed by SWC) to ensure that source mapping works. // modules (as transformed by SWC) to ensure that source mapping works.
if (buildInfo.rsc.actionIds && process.env.NODE_ENV === 'production') { if (buildInfo.rsc.actionIds && process.env.NODE_ENV === 'production') {
return Object.entries(buildInfo.rsc.actionIds) return (
.map(([id, name]) => { prefix +
return `export { ${name} } from 'next-flight-server-reference-proxy-loader?id=${id}&name=${name}!'` Object.entries(buildInfo.rsc.actionIds)
}) .map(([id, name]) => {
.join('\n') return `export { ${name} } from 'next-flight-server-reference-proxy-loader?id=${id}&name=${name}!'`
})
.join('\n')
)
} }
return this.callback(null, source, sourceMap) return this.callback(null, source, sourceMap)
......
...@@ -60,13 +60,18 @@ export default function transformSource( ...@@ -60,13 +60,18 @@ export default function transformSource(
if (typeof source !== 'string') { if (typeof source !== 'string') {
throw new Error('Expected source to have been transformed to a string.') throw new Error('Expected source to have been transformed to a string.')
} }
const module = this._module! const module = this._module!
// Assign the RSC meta information to buildInfo. // Assign the RSC meta information to buildInfo.
// Exclude next internal files which are not marked as client files // Exclude next internal files which are not marked as client files
const buildInfo = getModuleBuildInfo(module) const buildInfo = getModuleBuildInfo(module)
buildInfo.rsc = getRSCModuleInformation(source, true) buildInfo.rsc = getRSCModuleInformation(source, true)
let prefix = ''
if (process.env.BUILTIN_FLIGHT_CLIENT_ENTRY_PLUGIN) {
const rscModuleInformationJson = JSON.stringify(buildInfo.rsc)
prefix = `/* __rspack_internal_rsc_module_information_do_not_use__ ${rscModuleInformationJson} */\n`
source = prefix + source
}
// Resource key is the unique identifier for the resource. When RSC renders // Resource key is the unique identifier for the resource. When RSC renders
// a client module, that key is used to identify that module across all compiler // a client module, that key is used to identify that module across all compiler
...@@ -112,7 +117,9 @@ export default function transformSource( ...@@ -112,7 +117,9 @@ export default function transformSource(
return return
} }
let esmSource = `\ let esmSource =
prefix +
`\
import { registerClientReference } from "react-server-dom-webpack/server.edge"; import { registerClientReference } from "react-server-dom-webpack/server.edge";
` `
for (const ref of clientRefs) { for (const ref of clientRefs) {
...@@ -139,12 +146,13 @@ ${JSON.stringify(ref)}, ...@@ -139,12 +146,13 @@ ${JSON.stringify(ref)},
return this.callback(null, esmSource, sourceMap) return this.callback(null, esmSource, sourceMap)
} else if (assumedSourceType === 'commonjs') { } else if (assumedSourceType === 'commonjs') {
let cjsSource = `\ let cjsSource =
prefix +
`\
const { createProxy } = require("${MODULE_PROXY_PATH}") const { createProxy } = require("${MODULE_PROXY_PATH}")
module.exports = createProxy(${stringifiedResourceKey}) module.exports = createProxy(${stringifiedResourceKey})
` `
return this.callback(null, cjsSource, sourceMap) return this.callback(null, cjsSource, sourceMap)
} }
} }
......
...@@ -941,38 +941,55 @@ export class FlightClientEntryPlugin { ...@@ -941,38 +941,55 @@ export class FlightClientEntryPlugin {
} }
addEntry( addEntry(
compilation: any, compilation: webpack.Compilation,
context: string, context: string,
dependency: webpack.Dependency, dependency: webpack.Dependency,
options: webpack.EntryOptions options: webpack.EntryOptions
): Promise<any> /* Promise<module> */ { ): Promise<any> /* Promise<module> */ {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const entry = compilation.entries.get(options.name) if ('rspack' in compilation.compiler) {
entry.includeDependencies.push(dependency) compilation.addInclude(context, dependency, options, (err, module) => {
compilation.hooks.addEntry.call(entry, options)
compilation.addModuleTree(
{
context,
dependency,
contextInfo: { issuerLayer: options.layer },
},
(err: Error | undefined, module: any) => {
if (err) { if (err) {
compilation.hooks.failedEntry.call(dependency, options, err)
return reject(err) return reject(err)
} }
compilation.hooks.succeedEntry.call(dependency, options, module)
compilation.moduleGraph compilation.moduleGraph
.getExportsInfo(module) .getExportsInfo(module!)
.setUsedInUnknownWay( .setUsedInUnknownWay(
this.isEdgeServer ? EDGE_RUNTIME_WEBPACK : DEFAULT_RUNTIME_WEBPACK this.isEdgeServer ? EDGE_RUNTIME_WEBPACK : DEFAULT_RUNTIME_WEBPACK
) )
return resolve(module) return resolve(module)
} })
) } else {
const entry = compilation.entries.get(options.name!)!
entry.includeDependencies.push(dependency)
compilation.hooks.addEntry.call(entry as any, options)
compilation.addModuleTree(
{
context,
dependency,
contextInfo: { issuerLayer: options.layer },
},
(err: any, module: any) => {
if (err) {
compilation.hooks.failedEntry.call(dependency, options, err)
return reject(err)
}
compilation.hooks.succeedEntry.call(dependency, options, module)
compilation.moduleGraph
.getExportsInfo(module)
.setUsedInUnknownWay(
this.isEdgeServer
? EDGE_RUNTIME_WEBPACK
: DEFAULT_RUNTIME_WEBPACK
)
return resolve(module)
}
)
}
}) })
} }
......
...@@ -324,8 +324,7 @@ export class ClientReferenceManifestPlugin { ...@@ -324,8 +324,7 @@ export class ClientReferenceManifestPlugin {
const recordModule = (modId: ModuleId, mod: webpack.NormalModule) => { const recordModule = (modId: ModuleId, mod: webpack.NormalModule) => {
let resource = let resource =
mod.type === 'css/mini-extract' mod.type === 'css/mini-extract'
? // @ts-expect-error TODO: use `identifier()` instead. ? mod.identifier().slice(mod.identifier().lastIndexOf('!') + 1)
mod._identifier.slice(mod._identifier.lastIndexOf('!') + 1)
: mod.resource : mod.resource
if (!resource) { if (!resource) {
...@@ -525,7 +524,11 @@ export class ClientReferenceManifestPlugin { ...@@ -525,7 +524,11 @@ export class ClientReferenceManifestPlugin {
} else { } else {
// If this is a concatenation, register each child to the parent ID. // If this is a concatenation, register each child to the parent ID.
if ( if (
connection.module?.constructor.name === 'ConcatenatedModule' connection.module?.constructor.name ===
'ConcatenatedModule' ||
(Boolean(process.env.NEXT_RSPACK) &&
(connection.module as any)?.constructorName ===
'ConcatenatedModule')
) { ) {
const concatenatedMod = connection.module const concatenatedMod = connection.module
const concatenatedModId = const concatenatedModId =
......
import type { Compiler } from '@rspack/core'
import {
getInvalidator,
getEntries,
EntryTypes,
getEntryKey,
} from '../../../server/dev/on-demand-entry-handler'
import { COMPILER_NAMES } from '../../../shared/lib/constants'
import { getProxiedPluginState } from '../../build-context'
import { PAGE_TYPES } from '../../../lib/page-types'
import { getRspackCore } from '../../../shared/lib/get-rspack'
type Actions = {
[actionId: string]: {
workers: {
[name: string]: { moduleId: string | number; async: boolean }
}
// Record which layer the action is in (rsc or sc_action), in the specific entry.
layer: {
[name: string]: string
}
}
}
export type ActionManifest = {
// Assign a unique encryption key during production build.
encryptionKey: string
node: Actions
edge: Actions
}
export interface ModuleInfo {
moduleId: string | number
async: boolean
}
const pluginState = getProxiedPluginState({
// A map to track "action" -> "list of bundles".
serverActions: {} as ActionManifest['node'],
edgeServerActions: {} as ActionManifest['edge'],
serverActionModules: {} as {
[workerName: string]: { server?: ModuleInfo; client?: ModuleInfo }
},
edgeServerActionModules: {} as {
[workerName: string]: { server?: ModuleInfo; client?: ModuleInfo }
},
ssrModules: {} as { [ssrModuleId: string]: ModuleInfo },
edgeSsrModules: {} as { [ssrModuleId: string]: ModuleInfo },
rscModules: {} as { [rscModuleId: string]: ModuleInfo },
edgeRscModules: {} as { [rscModuleId: string]: ModuleInfo },
injectedClientEntries: {} as Record<string, string>,
})
interface Options {
dev: boolean
appDir: string
isEdgeServer: boolean
encryptionKey: string
}
export class RspackFlightClientEntryPlugin {
plugin: any
compiler?: Compiler
constructor(options: Options) {
const { FlightClientEntryPlugin } = getRspackCore()
this.plugin = new FlightClientEntryPlugin({
...options,
builtinAppLoader: !!process.env.BUILTIN_SWC_LOADER,
shouldInvalidateCb: ({
bundlePath,
entryName,
absolutePagePath,
clientBrowserLoader,
}: any) => {
let shouldInvalidate = false
const compiler = this.compiler!
const entries = getEntries(compiler.outputPath)
const pageKey = getEntryKey(
COMPILER_NAMES.client,
PAGE_TYPES.APP,
bundlePath
)
if (!entries[pageKey]) {
entries[pageKey] = {
type: EntryTypes.CHILD_ENTRY,
parentEntries: new Set([entryName]),
absoluteEntryFilePath: absolutePagePath,
bundlePath,
request: clientBrowserLoader,
dispose: false,
lastActiveTime: Date.now(),
}
shouldInvalidate = true
} else {
const entryData = entries[pageKey]
// New version of the client loader
if (entryData.request !== clientBrowserLoader) {
entryData.request = clientBrowserLoader
shouldInvalidate = true
}
if (entryData.type === EntryTypes.CHILD_ENTRY) {
entryData.parentEntries.add(entryName)
}
entryData.dispose = false
entryData.lastActiveTime = Date.now()
}
return shouldInvalidate
},
invalidateCb: () => {
const compiler = this.compiler!
// Invalidate in development to trigger recompilation
const invalidator = getInvalidator(compiler.outputPath)
// Check if any of the entry injections need an invalidation
if (invalidator) {
invalidator.invalidate([COMPILER_NAMES.client])
}
},
stateCb: (state: any) => {
Object.assign(pluginState.serverActions, state.serverActions)
Object.assign(pluginState.edgeServerActions, state.edgeServerActions)
Object.assign(
pluginState.serverActionModules,
state.serverActionModules
)
Object.assign(
pluginState.edgeServerActionModules,
state.edgeServerActionModules
)
Object.assign(pluginState.ssrModules, state.ssrModules)
Object.assign(pluginState.edgeSsrModules, state.edgeSsrModules)
Object.assign(pluginState.rscModules, state.rscModules)
Object.assign(pluginState.edgeRscModules, state.edgeRscModules)
Object.assign(
pluginState.injectedClientEntries,
state.injectedClientEntries
)
},
})
}
apply(compiler: Compiler) {
this.compiler = compiler
this.plugin.apply(compiler)
}
}
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