Skip to content

Commit 4a1e56a

Browse files
2heal12heal1
committed
feat: support lazy compilation
1 parent c9a015b commit 4a1e56a

File tree

20 files changed

+570
-354
lines changed

20 files changed

+570
-354
lines changed

‎.changeset/real-peas-compare.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/webpack-bundler-runtime': patch
3+
---
4+
5+
fix(webpack-bundler-runtime): update bundler runtime options before calling function

‎.changeset/thick-lies-speak.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/rspress-plugin': patch
3+
---
4+
5+
feat(rspress-plugin): support lazy compilation

‎.changeset/tough-insects-fetch.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@module-federation/webpack-bundler-runtime': patch
3+
'@module-federation/enhanced': patch
4+
---
5+
6+
fix(webpack-bundler-runtime): align with rspack bundler runtime variable

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
4343
with:
4444
node-version: 22
45-
cache: 'pnpm'
4645

4746
# Update npm to the latest version to enable OIDC
4847
- name: Update npm
@@ -56,7 +55,8 @@ jobs:
5655
- name: Generate preview version
5756
if: github.event.inputs.version == 'next'
5857
run: |
59-
npx changeset version --snapshot next
58+
SAFE_BRANCH=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9-]/-/g' | tr '[:upper:]' '[:lower:]')
59+
npx changeset version --snapshot "$SAFE_BRANCH"
6060
6161
- name: Build and test Packages
6262
run: |

‎packages/enhanced/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
"@types/btoa": "^1.2.5",
8888
"ajv": "^8.17.1",
8989
"enhanced-resolve": "^5.0.0",
90-
"terser": "^5.37.0"
90+
"terser": "^5.37.0",
91+
"memfs": "4.46.0"
9192
},
9293
"dependencies": {
9394
"@module-federation/bridge-react-webpack-plugin": "workspace:*",

‎packages/enhanced/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"parallel": false,
5050
"commands": [
5151
{
52-
"command": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation ./node_modules/jest-cli/bin/jest --logHeapUsage --config packages/enhanced/jest.config.ts --silent",
52+
"command": "node --expose-gc --max-old-space-size=24576 --experimental-vm-modules --trace-deprecation ./node_modules/jest-cli/bin/jest --logHeapUsage --config packages/enhanced/jest.config.ts --silent",
5353
"forwardAllArgs": false
5454
}
5555
]
@@ -61,7 +61,7 @@
6161
"parallel": false,
6262
"commands": [
6363
{
64-
"command": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation ./node_modules/jest-cli/bin/jest --logHeapUsage --config packages/enhanced/jest.embed.ts --silent",
64+
"command": "node --expose-gc --max-old-space-size=24576 --experimental-vm-modules --trace-deprecation ./node_modules/jest-cli/bin/jest --logHeapUsage --config packages/enhanced/jest.embed.ts --silent",
6565
"forwardAllArgs": false
6666
}
6767
]

‎packages/enhanced/src/lib/container/RemoteRuntimeModule.ts‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import RemoteModule from './RemoteModule';
88
import { getFederationGlobalScope } from './runtime/utils';
99
import type ExternalModule from 'webpack/lib/ExternalModule';
1010
import type FallbackModule from './FallbackModule';
11-
import type { RemotesOptions } from '@module-federation/webpack-bundler-runtime';
11+
import type {
12+
ModuleIdToRemoteDataMapping,
13+
RemotesOptions,
14+
} from '@module-federation/webpack-bundler-runtime';
1215

1316
const extractUrlAndGlobal = require(
1417
normalizeWebpackPath('webpack/lib/util/extractUrlAndGlobal'),
@@ -32,6 +35,8 @@ class RemoteRuntimeModule extends RuntimeModule {
3235
const chunkToRemotesMapping: Record<string, any> = {};
3336
const idToExternalAndNameMapping: Record<string | number, any> = {};
3437
const idToRemoteMap: RemotesOptions['idToRemoteMap'] = {};
38+
const moduleIdToRemoteDataMapping: ModuleIdToRemoteDataMapping = {};
39+
3540
// let chunkReferences: Set<Chunk> = new Set();
3641

3742
// if (this.chunk && chunkGraph) {
@@ -113,8 +118,13 @@ class RemoteRuntimeModule extends RuntimeModule {
113118
idToRemoteMap[id].push({
114119
externalType: remoteModule.externalType,
115120
name: remoteModule.externalType === 'script' ? remoteName : '',
116-
externalModuleId,
117121
});
122+
moduleIdToRemoteDataMapping[id] = {
123+
shareScope: shareScope as string,
124+
name,
125+
externalModuleId: externalModuleId as string,
126+
remoteName: '',
127+
};
118128
});
119129
}
120130
}
@@ -135,7 +145,14 @@ class RemoteRuntimeModule extends RuntimeModule {
135145
'\t',
136146
)};`,
137147
`var idToRemoteMap = ${JSON.stringify(idToRemoteMap, null, '\t')};`,
138-
`${federationGlobal}.bundlerRuntimeOptions.remotes = {idToRemoteMap,chunkMapping, idToExternalAndNameMapping, webpackRequire:${RuntimeGlobals.require}};`,
148+
`${federationGlobal}.bundlerRuntimeOptions.remotes.chunkMapping = chunkMapping;`,
149+
`${federationGlobal}.bundlerRuntimeOptions.remotes.idToExternalAndNameMapping = idToExternalAndNameMapping;`,
150+
`${federationGlobal}.bundlerRuntimeOptions.remotes.idToRemoteMap = idToRemoteMap;`,
151+
`${RuntimeGlobals.require}.remotesLoadingData.moduleIdToRemoteDataMapping = ${JSON.stringify(
152+
moduleIdToRemoteDataMapping,
153+
null,
154+
'\t',
155+
)};`,
139156
`${
140157
RuntimeGlobals.ensureChunkHandlers
141158
}.remotes = ${runtimeTemplate.basicFunction('chunkId, promises', [

‎packages/enhanced/src/lib/container/runtime/getFederationGlobal.ts‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-p
22
import { getFederationGlobalScope } from './utils';
33
import type RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
44
import { NormalizedRuntimeInitOptionsWithOutShared } from '../../../types/runtime';
5+
import type { RemoteInfos } from '@module-federation/webpack-bundler-runtime';
56

67
const { Template } = require(
78
normalizeWebpackPath('webpack'),
@@ -15,7 +16,29 @@ function getFederationGlobal(
1516
initOptionsWithoutShared: NormalizedRuntimeInitOptionsWithOutShared,
1617
): string {
1718
const federationGlobal = getFederationGlobalScope(runtimeGlobals);
18-
const initOptionsStrWithoutShared = JSON.stringify(initOptionsWithoutShared);
19+
const initOptionsStrWithoutShared = JSON.stringify({
20+
...initOptionsWithoutShared,
21+
remotes: initOptionsWithoutShared.remotes.filter(
22+
(remote) => remote.externalType === 'script',
23+
),
24+
});
25+
const remoteInfos = JSON.stringify(
26+
initOptionsWithoutShared.remotes.reduce((acc, remote) => {
27+
const item: RemoteInfos[string][0] = {
28+
alias: remote.alias || '',
29+
name: remote.name,
30+
// @ts-ignore
31+
entry: remote.entry || '',
32+
// @ts-ignore
33+
shareScope: remote.shareScope,
34+
externalType: remote.externalType,
35+
};
36+
const key = remote.name || remote.alias || '';
37+
acc[key] ||= [];
38+
acc[key].push(item);
39+
return acc;
40+
}, {} as RemoteInfos),
41+
);
1942

2043
return template.asString([
2144
`if(!${federationGlobal}){`,
@@ -25,11 +48,12 @@ function getFederationGlobal(
2548
`initOptions: ${initOptionsStrWithoutShared},`,
2649
`chunkMatcher: function(chunkId) {return ${matcher}},`,
2750
`rootOutputDir: ${JSON.stringify(rootOutputDir || '')},`,
28-
`initialConsumes: undefined,`,
29-
'bundlerRuntimeOptions: {}',
51+
`bundlerRuntimeOptions: { remotes: { remoteInfos: ${remoteInfos}, webpackRequire: ${runtimeGlobals.require},idToRemoteMap: {}, chunkMapping: {},idToExternalAndNameMapping: {} } }`,
3052
]),
3153
'};',
3254
]),
55+
`${runtimeGlobals.require}.consumesLoadingData = {}`,
56+
`${runtimeGlobals.require}.remotesLoadingData = {}`,
3357
'}',
3458
]);
3559
}

‎packages/enhanced/src/lib/container/runtime/utils.ts‎

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import upath from 'upath';
77
import path from 'path';
88
import crypto from 'crypto';
99
import { parseOptions } from '../options';
10-
import type { init } from '@module-federation/runtime-tools';
1110
import type webpack from 'webpack';
1211
import type RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
1312
import type { moduleFederationPlugin } from '@module-federation/sdk';
@@ -21,8 +20,6 @@ type EntryStaticNormalized = Awaited<
2120
ReturnType<Extract<webpack.WebpackOptionsNormalized['entry'], () => any>>
2221
>;
2322

24-
type Remotes = Parameters<typeof init>[0]['remotes'];
25-
2623
interface ModifyEntryOptions {
2724
compiler: webpack.Compiler;
2825
prependEntry?: (entry: EntryStaticNormalized) => void;
@@ -49,27 +46,47 @@ export function normalizeRuntimeInitOptionsWithOutShared(
4946
shareScope: item.shareScope || options.shareScope || 'default',
5047
}),
5148
);
52-
const remoteOptions: Remotes = [];
49+
const remoteOptions: NormalizedRuntimeInitOptionsWithOutShared['remotes'] =
50+
[];
5351
parsedOptions.forEach((parsedOption) => {
5452
const [alias, remoteInfos] = parsedOption;
5553
const { external, shareScope } = remoteInfos;
56-
try {
57-
// only fit for remoteType: 'script'
58-
const entry = external[0];
59-
if (/\s/.test(entry)) {
54+
external.forEach((externalItem) => {
55+
try {
56+
const entry = externalItem;
57+
if (/\s/.test(entry)) {
58+
return;
59+
}
60+
const [url, globalName] = extractUrlAndGlobal(externalItem);
61+
remoteOptions.push({
62+
alias,
63+
name: globalName,
64+
entry: url,
65+
shareScope: shareScope,
66+
externalType: 'script',
67+
});
68+
} catch (err) {
69+
const getExternalTypeFromExternal = (external: string) => {
70+
if (/^[a-z0-9-]+ /.test(external)) {
71+
const idx = external.indexOf(' ');
72+
return [
73+
external.slice(0, idx) as moduleFederationPlugin.ExternalsType,
74+
external.slice(idx + 1),
75+
] as const;
76+
}
77+
return null;
78+
};
79+
remoteOptions.push({
80+
alias,
81+
name: '',
82+
entry: '',
83+
shareScope: shareScope,
84+
// @ts-ignore
85+
externalType: getExternalTypeFromExternal(externalItem) || 'unknown',
86+
});
6087
return;
6188
}
62-
const [url, globalName] = extractUrlAndGlobal(external[0]);
63-
remoteOptions.push({
64-
alias,
65-
name: globalName,
66-
entry: url,
67-
shareScope: shareScope,
68-
// externalType
69-
});
70-
} catch (err) {
71-
return;
72-
}
89+
});
7390
});
7491

7592
const initOptionsWithoutShared = {

‎packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
125125

126126
return Template.asString([
127127
'var installedModules = {};',
128-
'var moduleToHandlerMapping = {',
128+
`${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping = {`,
129129
Template.indent(
130130
Array.from(moduleIdToSourceMapping, ([key, value]) => {
131131
return `${JSON.stringify(key)}: ${value}`;
@@ -135,14 +135,14 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
135135

136136
initialConsumes.length > 0
137137
? Template.asString([
138-
`var initialConsumes = ${JSON.stringify(initialConsumes)};`,
138+
`${RuntimeGlobals.require}.consumesLoadingData.initialConsumes = ${JSON.stringify(initialConsumes)};`,
139139
`${federationGlobal}.installInitialConsumes = ${runtimeTemplate.returningFunction(
140140
Template.asString([
141141
`${federationGlobal}.bundlerRuntime.installInitialConsumes({`,
142142
Template.indent([
143-
'initialConsumes: initialConsumes,',
143+
`initialConsumes: ${RuntimeGlobals.require}.consumesLoadingData.initialConsumes,`,
144144
'installedModules:installedModules,',
145-
'moduleToHandlerMapping:moduleToHandlerMapping,',
145+
`moduleToHandlerMapping:${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping,`,
146146
`webpackRequire: ${RuntimeGlobals.require}`,
147147
]),
148148
`})`,
@@ -153,7 +153,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
153153
: '// no consumes in initial chunks',
154154
this._runtimeRequirements.has(RuntimeGlobals.ensureChunkHandlers)
155155
? Template.asString([
156-
`var chunkMapping = ${JSON.stringify(
156+
`${RuntimeGlobals.require}.consumesLoadingData.chunkMapping = ${JSON.stringify(
157157
chunkToModuleMapping,
158158
null,
159159
'\t',
@@ -162,10 +162,10 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
162162
RuntimeGlobals.ensureChunkHandlers
163163
}.consumes = ${runtimeTemplate.basicFunction('chunkId, promises', [
164164
`${federationGlobal}.bundlerRuntime.consumes({`,
165-
'chunkMapping: chunkMapping,',
165+
`chunkMapping: ${RuntimeGlobals.require}.consumesLoadingData.chunkMapping,`,
166166
'installedModules: installedModules,',
167167
'chunkId: chunkId,',
168-
'moduleToHandlerMapping: moduleToHandlerMapping,',
168+
`moduleToHandlerMapping: ${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping,`,
169169
'promises: promises,',
170170
`webpackRequire:${RuntimeGlobals.require}`,
171171
'});',

0 commit comments

Comments
 (0)