From 8373e2ddbd579320b9e9221cfc9916f221f56a72 Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Sun, 28 Sep 2025 17:47:21 +0800 Subject: [PATCH 01/10] feat: support lazy compilation --- .changeset/real-peas-compare.md | 5 + .changeset/thick-lies-speak.md | 5 + .changeset/tough-insects-fetch.md | 6 + .github/workflows/release.yml | 4 +- packages/enhanced/jest.config.ts | 2 +- packages/enhanced/project.json | 4 +- .../src/lib/container/RemoteRuntimeModule.ts | 23 +- .../container/runtime/getFederationGlobal.ts | 30 ++- .../src/lib/container/runtime/utils.ts | 55 ++-- .../lib/sharing/ConsumeSharedRuntimeModule.ts | 14 +- packages/enhanced/src/types/runtime.ts | 5 +- .../sharing/resolveMatchedConfigs.test.ts | 5 +- packages/rspress-plugin/src/plugin.ts | 9 - .../__tests__/updateOptions.test.ts | 223 ++++++++++++++++ .../webpack-bundler-runtime/src/consumes.ts | 7 +- .../webpack-bundler-runtime/src/container.ts | 248 ------------------ .../src/installInitialConsumes.ts | 11 +- .../webpack-bundler-runtime/src/remotes.ts | 7 +- packages/webpack-bundler-runtime/src/types.ts | 75 +++++- .../src/updateOptions.ts | 85 ++++++ 20 files changed, 504 insertions(+), 319 deletions(-) create mode 100644 .changeset/real-peas-compare.md create mode 100644 .changeset/thick-lies-speak.md create mode 100644 .changeset/tough-insects-fetch.md create mode 100644 packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts delete mode 100644 packages/webpack-bundler-runtime/src/container.ts create mode 100644 packages/webpack-bundler-runtime/src/updateOptions.ts diff --git a/.changeset/real-peas-compare.md b/.changeset/real-peas-compare.md new file mode 100644 index 00000000000..ab91ebd04fc --- /dev/null +++ b/.changeset/real-peas-compare.md @@ -0,0 +1,5 @@ +--- +'@module-federation/webpack-bundler-runtime': patch +--- + +fix(webpack-bundler-runtime): update bundler runtime options before calling function diff --git a/.changeset/thick-lies-speak.md b/.changeset/thick-lies-speak.md new file mode 100644 index 00000000000..56f34beb31d --- /dev/null +++ b/.changeset/thick-lies-speak.md @@ -0,0 +1,5 @@ +--- +'@module-federation/rspress-plugin': patch +--- + +feat(rspress-plugin): support lazy compilation diff --git a/.changeset/tough-insects-fetch.md b/.changeset/tough-insects-fetch.md new file mode 100644 index 00000000000..6488497bb89 --- /dev/null +++ b/.changeset/tough-insects-fetch.md @@ -0,0 +1,6 @@ +--- +'@module-federation/webpack-bundler-runtime': patch +'@module-federation/enhanced': patch +--- + +fix(webpack-bundler-runtime): align with rspack bundler runtime variable diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cde888a2c1..3f3f5cce762 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,6 @@ jobs: uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: 22 - cache: 'pnpm' # Update npm to the latest version to enable OIDC - name: Update npm @@ -56,7 +55,8 @@ jobs: - name: Generate preview version if: github.event.inputs.version == 'next' run: | - npx changeset version --snapshot next + SAFE_BRANCH=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9-]/-/g' | tr '[:upper:]' '[:lower:]') + npx changeset version --snapshot "$SAFE_BRANCH" - name: Build and test Packages run: | diff --git a/packages/enhanced/jest.config.ts b/packages/enhanced/jest.config.ts index 4161f8ed279..05e682332aa 100644 --- a/packages/enhanced/jest.config.ts +++ b/packages/enhanced/jest.config.ts @@ -34,8 +34,8 @@ export default { coverageDirectory: '../../coverage/packages/enhanced', rootDir: __dirname, testMatch: [ - '/test/*.basictest.js', '/test/unit/**/*.test.ts', + '/test/*.basictest.js', ], silent: true, verbose: false, diff --git a/packages/enhanced/project.json b/packages/enhanced/project.json index 57375dba310..d3d73607c2d 100644 --- a/packages/enhanced/project.json +++ b/packages/enhanced/project.json @@ -49,7 +49,7 @@ "parallel": false, "commands": [ { - "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", + "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", "forwardAllArgs": false } ] @@ -61,7 +61,7 @@ "parallel": false, "commands": [ { - "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", + "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", "forwardAllArgs": false } ] diff --git a/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts b/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts index 2f50eca5a7e..b7e42132ad1 100644 --- a/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts +++ b/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts @@ -8,7 +8,10 @@ import RemoteModule from './RemoteModule'; import { getFederationGlobalScope } from './runtime/utils'; import type ExternalModule from 'webpack/lib/ExternalModule'; import type FallbackModule from './FallbackModule'; -import type { RemotesOptions } from '@module-federation/webpack-bundler-runtime'; +import type { + ModuleIdToRemoteDataMapping, + RemotesOptions, +} from '@module-federation/webpack-bundler-runtime'; const extractUrlAndGlobal = require( normalizeWebpackPath('webpack/lib/util/extractUrlAndGlobal'), @@ -32,6 +35,8 @@ class RemoteRuntimeModule extends RuntimeModule { const chunkToRemotesMapping: Record = {}; const idToExternalAndNameMapping: Record = {}; const idToRemoteMap: RemotesOptions['idToRemoteMap'] = {}; + const moduleIdToRemoteDataMapping: ModuleIdToRemoteDataMapping = {}; + // let chunkReferences: Set = new Set(); // if (this.chunk && chunkGraph) { @@ -113,8 +118,13 @@ class RemoteRuntimeModule extends RuntimeModule { idToRemoteMap[id].push({ externalType: remoteModule.externalType, name: remoteModule.externalType === 'script' ? remoteName : '', - externalModuleId, }); + moduleIdToRemoteDataMapping[id] = { + shareScope: shareScope as string, + name, + externalModuleId: externalModuleId as string, + remoteName: '', + }; }); } } @@ -135,7 +145,14 @@ class RemoteRuntimeModule extends RuntimeModule { '\t', )};`, `var idToRemoteMap = ${JSON.stringify(idToRemoteMap, null, '\t')};`, - `${federationGlobal}.bundlerRuntimeOptions.remotes = {idToRemoteMap,chunkMapping, idToExternalAndNameMapping, webpackRequire:${RuntimeGlobals.require}};`, + `${federationGlobal}.bundlerRuntimeOptions.remotes.chunkMapping = chunkMapping;`, + `${federationGlobal}.bundlerRuntimeOptions.remotes.idToExternalAndNameMapping = idToExternalAndNameMapping;`, + `${federationGlobal}.bundlerRuntimeOptions.remotes.idToRemoteMap = idToRemoteMap;`, + `${RuntimeGlobals.require}.remotesLoadingData.moduleIdToRemoteDataMapping = ${JSON.stringify( + moduleIdToRemoteDataMapping, + null, + '\t', + )};`, `${ RuntimeGlobals.ensureChunkHandlers }.remotes = ${runtimeTemplate.basicFunction('chunkId, promises', [ diff --git a/packages/enhanced/src/lib/container/runtime/getFederationGlobal.ts b/packages/enhanced/src/lib/container/runtime/getFederationGlobal.ts index 12d07593b3d..8b8d7dd41b7 100644 --- a/packages/enhanced/src/lib/container/runtime/getFederationGlobal.ts +++ b/packages/enhanced/src/lib/container/runtime/getFederationGlobal.ts @@ -2,6 +2,7 @@ import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-p import { getFederationGlobalScope } from './utils'; import type RuntimeGlobals from 'webpack/lib/RuntimeGlobals'; import { NormalizedRuntimeInitOptionsWithOutShared } from '../../../types/runtime'; +import type { RemoteInfos } from '@module-federation/webpack-bundler-runtime'; const { Template } = require( normalizeWebpackPath('webpack'), @@ -15,7 +16,29 @@ function getFederationGlobal( initOptionsWithoutShared: NormalizedRuntimeInitOptionsWithOutShared, ): string { const federationGlobal = getFederationGlobalScope(runtimeGlobals); - const initOptionsStrWithoutShared = JSON.stringify(initOptionsWithoutShared); + const initOptionsStrWithoutShared = JSON.stringify({ + ...initOptionsWithoutShared, + remotes: initOptionsWithoutShared.remotes.filter( + (remote) => remote.externalType === 'script', + ), + }); + const remoteInfos = JSON.stringify( + initOptionsWithoutShared.remotes.reduce((acc, remote) => { + const item: RemoteInfos[string][0] = { + alias: remote.alias || '', + name: remote.name, + // @ts-ignore + entry: remote.entry || '', + // @ts-ignore + shareScope: remote.shareScope, + externalType: remote.externalType, + }; + const key = remote.name || remote.alias || ''; + acc[key] ||= []; + acc[key].push(item); + return acc; + }, {} as RemoteInfos), + ); return template.asString([ `if(!${federationGlobal}){`, @@ -25,11 +48,12 @@ function getFederationGlobal( `initOptions: ${initOptionsStrWithoutShared},`, `chunkMatcher: function(chunkId) {return ${matcher}},`, `rootOutputDir: ${JSON.stringify(rootOutputDir || '')},`, - `initialConsumes: undefined,`, - 'bundlerRuntimeOptions: {}', + `bundlerRuntimeOptions: { remotes: { remoteInfos: ${remoteInfos}, webpackRequire: ${runtimeGlobals.require},idToRemoteMap: {}, chunkMapping: {},idToExternalAndNameMapping: {} } }`, ]), '};', ]), + `${runtimeGlobals.require}.consumesLoadingData = {}`, + `${runtimeGlobals.require}.remotesLoadingData = {}`, '}', ]); } diff --git a/packages/enhanced/src/lib/container/runtime/utils.ts b/packages/enhanced/src/lib/container/runtime/utils.ts index 18886f0ff01..44b9db33944 100644 --- a/packages/enhanced/src/lib/container/runtime/utils.ts +++ b/packages/enhanced/src/lib/container/runtime/utils.ts @@ -7,7 +7,6 @@ import upath from 'upath'; import path from 'path'; import crypto from 'crypto'; import { parseOptions } from '../options'; -import type { init } from '@module-federation/runtime-tools'; import type webpack from 'webpack'; import type RuntimeGlobals from 'webpack/lib/RuntimeGlobals'; import type { moduleFederationPlugin } from '@module-federation/sdk'; @@ -21,8 +20,6 @@ type EntryStaticNormalized = Awaited< ReturnType any>> >; -type Remotes = Parameters[0]['remotes']; - interface ModifyEntryOptions { compiler: webpack.Compiler; prependEntry?: (entry: EntryStaticNormalized) => void; @@ -49,27 +46,47 @@ export function normalizeRuntimeInitOptionsWithOutShared( shareScope: item.shareScope || options.shareScope || 'default', }), ); - const remoteOptions: Remotes = []; + const remoteOptions: NormalizedRuntimeInitOptionsWithOutShared['remotes'] = + []; parsedOptions.forEach((parsedOption) => { const [alias, remoteInfos] = parsedOption; const { external, shareScope } = remoteInfos; - try { - // only fit for remoteType: 'script' - const entry = external[0]; - if (/\s/.test(entry)) { + external.forEach((externalItem) => { + try { + const entry = externalItem; + if (/\s/.test(entry)) { + return; + } + const [url, globalName] = extractUrlAndGlobal(externalItem); + remoteOptions.push({ + alias, + name: globalName, + entry: url, + shareScope: shareScope, + externalType: 'script', + }); + } catch (err) { + const getExternalTypeFromExternal = (external: string) => { + if (/^[a-z0-9-]+ /.test(external)) { + const idx = external.indexOf(' '); + return [ + external.slice(0, idx) as moduleFederationPlugin.ExternalsType, + external.slice(idx + 1), + ] as const; + } + return null; + }; + remoteOptions.push({ + alias, + name: '', + entry: '', + shareScope: shareScope, + // @ts-ignore + externalType: getExternalTypeFromExternal(externalItem) || 'unknown', + }); return; } - const [url, globalName] = extractUrlAndGlobal(external[0]); - remoteOptions.push({ - alias, - name: globalName, - entry: url, - shareScope: shareScope, - // externalType - }); - } catch (err) { - return; - } + }); }); const initOptionsWithoutShared = { diff --git a/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts b/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts index 09ec9a9f5d1..a5f1651346c 100644 --- a/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts +++ b/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts @@ -125,7 +125,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { return Template.asString([ 'var installedModules = {};', - 'var moduleToHandlerMapping = {', + `${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping = {`, Template.indent( Array.from(moduleIdToSourceMapping, ([key, value]) => { return `${JSON.stringify(key)}: ${value}`; @@ -135,14 +135,14 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { initialConsumes.length > 0 ? Template.asString([ - `var initialConsumes = ${JSON.stringify(initialConsumes)};`, + `${RuntimeGlobals.require}.consumesLoadingData.initialConsumes = ${JSON.stringify(initialConsumes)};`, `${federationGlobal}.installInitialConsumes = ${runtimeTemplate.returningFunction( Template.asString([ `${federationGlobal}.bundlerRuntime.installInitialConsumes({`, Template.indent([ - 'initialConsumes: initialConsumes,', + `initialConsumes: ${RuntimeGlobals.require}.consumesLoadingData.initialConsumes,`, 'installedModules:installedModules,', - 'moduleToHandlerMapping:moduleToHandlerMapping,', + `moduleToHandlerMapping:${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping,`, `webpackRequire: ${RuntimeGlobals.require}`, ]), `})`, @@ -153,7 +153,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { : '// no consumes in initial chunks', this._runtimeRequirements.has(RuntimeGlobals.ensureChunkHandlers) ? Template.asString([ - `var chunkMapping = ${JSON.stringify( + `${RuntimeGlobals.require}.consumesLoadingData.chunkMapping = ${JSON.stringify( chunkToModuleMapping, null, '\t', @@ -162,10 +162,10 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { RuntimeGlobals.ensureChunkHandlers }.consumes = ${runtimeTemplate.basicFunction('chunkId, promises', [ `${federationGlobal}.bundlerRuntime.consumes({`, - 'chunkMapping: chunkMapping,', + `chunkMapping: ${RuntimeGlobals.require}.consumesLoadingData.chunkMapping,`, 'installedModules: installedModules,', 'chunkId: chunkId,', - 'moduleToHandlerMapping: moduleToHandlerMapping,', + `moduleToHandlerMapping: ${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping,`, 'promises: promises,', `webpackRequire:${RuntimeGlobals.require}`, '});', diff --git a/packages/enhanced/src/types/runtime.ts b/packages/enhanced/src/types/runtime.ts index 5d5f14bf50c..7d9e8c9b758 100644 --- a/packages/enhanced/src/types/runtime.ts +++ b/packages/enhanced/src/types/runtime.ts @@ -1,8 +1,11 @@ import type { init } from '@module-federation/runtime-tools'; +import type { moduleFederationPlugin } from '@module-federation/sdk'; type Remotes = Parameters[0]['remotes']; export interface NormalizedRuntimeInitOptionsWithOutShared { name: string; - remotes: Remotes; + remotes: Array< + Remotes[0] & { externalType: moduleFederationPlugin.ExternalsType } + >; } diff --git a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts index 88d1b618622..a9a97fc5bc1 100644 --- a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts +++ b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts @@ -7,7 +7,10 @@ import { resolveMatchedConfigs } from '../../../src/lib/sharing/resolveMatchedCo import type { ConsumeOptions } from '../../../src/declarations/plugins/sharing/ConsumeSharedModule'; jest.mock('@module-federation/sdk/normalize-webpack-path', () => ({ - normalizeWebpackPath: jest.fn((path) => path), + normalizeWebpackPath: jest.fn((path) => { + console.log('real path: ', path); + return path; + }), })); // Mock webpack classes diff --git a/packages/rspress-plugin/src/plugin.ts b/packages/rspress-plugin/src/plugin.ts index 26b48264fdc..e9bf6ee791f 100644 --- a/packages/rspress-plugin/src/plugin.ts +++ b/packages/rspress-plugin/src/plugin.ts @@ -144,15 +144,6 @@ export function pluginModuleFederation( config.builderConfig ||= {}; config.builderConfig.dev ||= {}; - if ( - isDev() && - typeof config.builderConfig.dev.lazyCompilation === 'undefined' - ) { - logger.warn( - 'lazyCompilation is not fully supported for module federation, set lazyCompilation to false', - ); - config.builderConfig.dev.lazyCompilation = false; - } config.builderConfig.plugins ||= []; config.builderConfig.plugins.push( rsbuildPluginModuleFederation(mfConfig, { diff --git a/packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts b/packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts new file mode 100644 index 00000000000..84d5839cf73 --- /dev/null +++ b/packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts @@ -0,0 +1,223 @@ +import { + updateConsumeOptions, + updateRemoteOptions, +} from '../src/updateOptions'; +import { InstallInitialConsumesOptions, RemotesOptions } from '../src/types'; + +describe('updateOptions', () => { + describe('updateConsumeOptions', () => { + it('should update consume options with new data', () => { + const mockWebpackRequire = { + consumesLoadingData: { + moduleIdToConsumeDataMapping: { + module1: { shareScope: 'default', name: 'react' }, + module2: { shareScope: 'custom', name: 'lodash' }, + }, + initialConsumes: ['module1', 'module3'], + chunkMapping: { + chunk1: ['module1', 'module2'], + chunk2: ['module3'], + }, + }, + } as any; + + const options: InstallInitialConsumesOptions = { + webpackRequire: mockWebpackRequire, + moduleToHandlerMapping: { + module3: { shareScope: 'existing', name: 'vue' } as any, + }, + installedModules: {}, + initialConsumes: ['module4'], + }; + + updateConsumeOptions(options); + + expect(options.moduleToHandlerMapping).toEqual({ + module3: { shareScope: 'existing', name: 'vue' } as any, + module1: { shareScope: 'default', name: 'react' } as any, + module2: { shareScope: 'custom', name: 'lodash' } as any, + }); + + expect(options.initialConsumes).toEqual([ + 'module4', + 'module1', + 'module3', + ]); + }); + + it('should handle empty consumesLoadingData', () => { + const mockWebpackRequire = {} as any; + const options: InstallInitialConsumesOptions = { + webpackRequire: mockWebpackRequire, + moduleToHandlerMapping: {}, + installedModules: {}, + initialConsumes: [], + }; + + updateConsumeOptions(options); + + expect(options.moduleToHandlerMapping).toEqual({}); + expect(options.initialConsumes).toEqual([]); + }); + + it('should handle missing chunkMapping', () => { + const mockWebpackRequire = { + consumesLoadingData: { + moduleIdToConsumeDataMapping: { + module1: { shareScope: 'default', name: 'react' }, + }, + }, + } as any; + + const options: InstallInitialConsumesOptions = { + webpackRequire: mockWebpackRequire, + moduleToHandlerMapping: {}, + installedModules: {}, + initialConsumes: [], + }; + + updateConsumeOptions(options); + + expect(options.moduleToHandlerMapping).toEqual({ + module1: { shareScope: 'default', name: 'react' } as any, + }); + }); + }); + + describe('updateRemoteOptions', () => { + it('should update remote options with new data', () => { + const mockWebpackRequire = { + remotesLoadingData: { + chunkMapping: { remote1: ['chunk1'] }, + moduleIdToRemoteDataMapping: { + remoteModule1: { + shareScope: 'default', + name: 'react', + remoteName: 'reactRemote', + externalModuleId: 'react-external', + }, + }, + }, + federation: { + bundlerRuntimeOptions: { + remotes: { + remoteInfos: { + reactRemote: { + url: 'http://localhost:3001', + name: 'react', + } as any, + }, + }, + }, + }, + } as any; + + const options: RemotesOptions = { + webpackRequire: mockWebpackRequire, + chunkId: 'test-chunk', + promises: [], + idToExternalAndNameMapping: {}, + idToRemoteMap: {}, + chunkMapping: {}, + }; + + updateRemoteOptions(options); + + expect(options.idToExternalAndNameMapping).toEqual({ + remoteModule1: ['default', 'react', 'react-external'], + }); + + expect(options.idToRemoteMap).toEqual({ + remoteModule1: [{ url: 'http://localhost:3001', name: 'react' }], + }); + }); + + it('should handle missing remotesLoadingData', () => { + const mockWebpackRequire = {} as any; + const options: RemotesOptions = { + webpackRequire: mockWebpackRequire, + chunkId: 'test-chunk', + promises: [], + idToExternalAndNameMapping: {}, + idToRemoteMap: {}, + chunkMapping: {}, + }; + + updateRemoteOptions(options); + + expect(options.idToExternalAndNameMapping).toEqual({}); + expect(options.idToRemoteMap).toEqual({}); + }); + + it('should handle existing mappings', () => { + const mockWebpackRequire = { + remotesLoadingData: { + moduleIdToRemoteDataMapping: { + existing: { + shareScope: 'existing', + name: 'existing-name', + remoteName: 'existing-remote', + externalModuleId: 'existing-external', + }, + }, + }, + } as any; + + const options: RemotesOptions = { + webpackRequire: mockWebpackRequire, + chunkId: 'test-chunk', + promises: [], + idToExternalAndNameMapping: { + existing: ['old', 'old-name', 'old-external'], + }, + idToRemoteMap: { + existing: [{ url: 'old-url', name: 'old' } as any], + }, + chunkMapping: {}, + }; + + updateRemoteOptions(options); + + // 应该保留现有映射，不覆盖 + expect(options.idToExternalAndNameMapping['existing']).toEqual([ + 'old', + 'old-name', + 'old-external', + ]); + expect(options.idToRemoteMap['existing']).toEqual([ + { url: 'old-url', name: 'old' }, + ]); + }); + + it('should handle missing remoteInfos', () => { + const mockWebpackRequire = { + remotesLoadingData: { + moduleIdToRemoteDataMapping: { + remoteModule1: { + shareScope: 'default', + name: 'react', + remoteName: 'missingRemote', + externalModuleId: 'react-external', + }, + }, + }, + } as any; + + const options: RemotesOptions = { + webpackRequire: mockWebpackRequire, + chunkId: 'test-chunk', + promises: [], + idToExternalAndNameMapping: {}, + idToRemoteMap: {}, + chunkMapping: {}, + }; + + updateRemoteOptions(options); + + expect(options.idToExternalAndNameMapping).toEqual({ + remoteModule1: ['default', 'react', 'react-external'], + }); + expect(options.idToRemoteMap).toEqual({}); + }); + }); +}); diff --git a/packages/webpack-bundler-runtime/src/consumes.ts b/packages/webpack-bundler-runtime/src/consumes.ts index e76fbe41833..2c0ad375b9d 100644 --- a/packages/webpack-bundler-runtime/src/consumes.ts +++ b/packages/webpack-bundler-runtime/src/consumes.ts @@ -1,15 +1,18 @@ import { ConsumesOptions } from './types'; import { attachShareScopeMap } from './attachShareScopeMap'; +import { updateConsumeOptions } from './updateOptions'; export function consumes(options: ConsumesOptions) { + updateConsumeOptions(options); const { chunkId, promises, - chunkMapping, installedModules, - moduleToHandlerMapping, webpackRequire, + chunkMapping, + moduleToHandlerMapping, } = options; + attachShareScopeMap(webpackRequire); if (webpackRequire.o(chunkMapping, chunkId)) { chunkMapping[chunkId].forEach((id) => { diff --git a/packages/webpack-bundler-runtime/src/container.ts b/packages/webpack-bundler-runtime/src/container.ts deleted file mode 100644 index a3fb08394e6..00000000000 --- a/packages/webpack-bundler-runtime/src/container.ts +++ /dev/null @@ -1,248 +0,0 @@ -// import bundler_runtime_base from './index'; -// import type { UserOptions } from '@module-federation/runtime/types'; - -// interface ExtendedOptions extends UserOptions { -// exposes: { [key: string]: () => Promise<() => any> }; -// } - -// export const createContainer = (federationOptions: ExtendedOptions) => { -// const { exposes, name, remotes = [], shared, plugins } = federationOptions; - -// const __webpack_modules__ = { -// './node_modules/.federation/entry.1f2288102e035e2ed66b2efaf60ad043.js': ( -// //@ts-ignore -// module, -// //@ts-ignore -// __webpack_exports__, -// //@ts-ignore -// __webpack_require__, -// ) => { -// __webpack_require__.r(__webpack_exports__); -// const bundler_runtime = __webpack_require__.n(bundler_runtime_base); -// const prevFederation = __webpack_require__.federation; -// __webpack_require__.federation = {}; -// for (const key in bundler_runtime()) { -// __webpack_require__.federation[key] = bundler_runtime()[key]; -// } -// for (const key in prevFederation) { -// __webpack_require__.federation[key] = prevFederation[key]; -// } -// if (!__webpack_require__.federation.instance) { -// const pluginsToAdd = plugins || []; -// __webpack_require__.federation.initOptions.plugins = __webpack_require__ -// .federation.initOptions.plugins -// ? __webpack_require__.federation.initOptions.plugins.concat( -// pluginsToAdd, -// ) -// : pluginsToAdd; -// __webpack_require__.federation.instance = -// __webpack_require__.federation.runtime.init( -// __webpack_require__.federation.initOptions, -// ); -// if (__webpack_require__.federation.attachShareScopeMap) { -// __webpack_require__.federation.attachShareScopeMap( -// __webpack_require__, -// ); -// } -// if (__webpack_require__.federation.installInitialConsumes) { -// __webpack_require__.federation.installInitialConsumes(); -// } -// } -// }, -// //@ts-ignore -// 'webpack/container/entry/createContainer': ( -// //@ts-ignore - -// module, -// //@ts-ignore -// exports, -// //@ts-ignore -// __webpack_require__, -// ) => { -// const moduleMap = {}; -// for (const key in exposes) { -// if (Object.prototype.hasOwnProperty.call(exposes, key)) { -// //@ts-ignore -// moduleMap[key] = () => -// Promise.resolve(exposes[key]()).then((m) => () => m); -// } -// } -// //@ts-ignore -// const get = (module, getScope) => { -// __webpack_require__.R = getScope; -// getScope = __webpack_require__.o(moduleMap, module) -// ? //@ts-ignore -// moduleMap[module]() -// : Promise.resolve().then(() => { -// throw new Error( -// `Module "${module}" does not exist in container.`, -// ); -// }); -// __webpack_require__.R = undefined; -// return getScope; -// }; -// //@ts-ignore -// const init = (shareScope, initScope, remoteEntryInitOptions) => { -// return __webpack_require__.federation.bundlerRuntime.initContainerEntry( -// { -// webpackRequire: __webpack_require__, -// shareScope: shareScope, -// initScope: initScope, -// remoteEntryInitOptions: remoteEntryInitOptions, -// shareScopeKey: 'default', -// }, -// ); -// }; -// __webpack_require__( -// './node_modules/.federation/entry.1f2288102e035e2ed66b2efaf60ad043.js', -// ); - -// // This exports getters to disallow modifications -// __webpack_require__.d(exports, { -// get: () => get, -// init: () => init, -// moduleMap: () => moduleMap, -// }); -// }, -// }; - -// const __webpack_module_cache__ = {}; - -// //@ts-ignore -// const __webpack_require__ = (moduleId) => { -// //@ts-ignore -// let cachedModule = __webpack_module_cache__[moduleId]; -// if (cachedModule !== undefined) { -// return cachedModule.exports; -// } -// //@ts-ignore -// let module = (__webpack_module_cache__[moduleId] = { -// id: moduleId, -// loaded: false, -// exports: {}, -// }); - -// const execOptions = { -// id: moduleId, -// module: module, -// //@ts-ignore -// factory: __webpack_modules__[moduleId], -// require: __webpack_require__, -// }; -// __webpack_require__.i.forEach((handler) => { -// handler(execOptions); -// }); -// module = execOptions.module; -// execOptions.factory.call( -// module.exports, -// module, -// module.exports, -// execOptions.require, -// ); - -// module.loaded = true; - -// return module.exports; -// }; - -// __webpack_require__.m = __webpack_modules__; -// __webpack_require__.c = __webpack_module_cache__; -// //@ts-ignore -// __webpack_require__.i = []; - -// //@ts-ignore -// if (!__webpack_require__.federation) { -// __webpack_require__.federation = { -// initOptions: { -// name: name, -// //@ts-ignore -// remotes: remotes.map((remote) => ({ -// type: remote.type, -// alias: remote.alias, -// name: remote.name, -// //@ts-ignore -// entry: remote.entry, -// shareScope: remote.shareScope || 'default', -// })), -// }, -// chunkMatcher: () => true, -// rootOutputDir: '', -// initialConsumes: undefined, -// bundlerRuntimeOptions: {}, -// }; -// } -// //@ts-ignore -// __webpack_require__.n = (module) => { -// const getter = -// module && module.__esModule ? () => module['default'] : () => module; -// __webpack_require__.d(getter, { a: getter }); -// return getter; -// }; - -// //@ts-ignore -// __webpack_require__.d = (exports, definition) => { -// for (const key in definition) { -// if ( -// __webpack_require__.o(definition, key) && -// !__webpack_require__.o(exports, key) -// ) { -// Object.defineProperty(exports, key, { -// enumerable: true, -// get: definition[key], -// }); -// } -// } -// }; - -// __webpack_require__.f = {}; - -// __webpack_require__.g = (() => { -// if (typeof globalThis === 'object') return globalThis; -// try { -// return this || new Function('return this')(); -// } catch (e) { -// if (typeof window === 'object') return window; -// } -// })(); - -// //@ts-ignore -// __webpack_require__.o = (obj, prop) => -// Object.prototype.hasOwnProperty.call(obj, prop); -// //@ts-ignore -// __webpack_require__.r = (exports) => { -// if (typeof Symbol !== 'undefined' && Symbol.toStringTag) { -// Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); -// } -// Object.defineProperty(exports, '__esModule', { value: true }); -// }; - -// //@ts-ignore -// __webpack_require__.federation.initOptions.shared = shared; -// __webpack_require__.S = {}; -// const initPromises = {}; -// const initTokens = {}; -// //@ts-ignore -// __webpack_require__.I = (name, initScope) => { -// //@ts-ignore -// return __webpack_require__.federation.bundlerRuntime.I({ -// shareScopeName: name, -// webpackRequire: __webpack_require__, -// initPromises: initPromises, -// initTokens: initTokens, -// initScope: initScope, -// }); -// }; - -// const __webpack_exports__ = __webpack_require__( -// 'webpack/container/entry/createContainer', -// ); -// const __webpack_exports__get = __webpack_exports__.get; -// const __webpack_exports__init = __webpack_exports__.init; -// return __webpack_exports__; -// }; -// export const createContainerAsync = async ( -// federationOptions: ExtendedOptions, -// ) => { -// // todo: consider async startup options here, for "async boundary" provision. -// return createContainer(federationOptions); -// }; diff --git a/packages/webpack-bundler-runtime/src/installInitialConsumes.ts b/packages/webpack-bundler-runtime/src/installInitialConsumes.ts index f6cc3aa2077..fc4c0eb92c6 100644 --- a/packages/webpack-bundler-runtime/src/installInitialConsumes.ts +++ b/packages/webpack-bundler-runtime/src/installInitialConsumes.ts @@ -2,6 +2,7 @@ import { HandleInitialConsumesOptions, InstallInitialConsumesOptions, } from './types'; +import { updateConsumeOptions } from './updateOptions'; function handleInitialConsumes(options: HandleInitialConsumesOptions) { const { moduleId, moduleToHandlerMapping, webpackRequire } = options; @@ -25,12 +26,10 @@ function handleInitialConsumes(options: HandleInitialConsumesOptions) { } export function installInitialConsumes(options: InstallInitialConsumesOptions) { - const { - moduleToHandlerMapping, - webpackRequire, - installedModules, - initialConsumes, - } = options; + const { webpackRequire } = options; + + updateConsumeOptions(options); + const { initialConsumes, moduleToHandlerMapping, installedModules } = options; initialConsumes.forEach((id) => { webpackRequire.m[id] = (module) => { diff --git a/packages/webpack-bundler-runtime/src/remotes.ts b/packages/webpack-bundler-runtime/src/remotes.ts index 7871d39011a..ed753a6b880 100644 --- a/packages/webpack-bundler-runtime/src/remotes.ts +++ b/packages/webpack-bundler-runtime/src/remotes.ts @@ -3,14 +3,17 @@ import type { RemoteEntryExports } from './types'; import { RemotesOptions } from './types'; import { FEDERATION_SUPPORTED_TYPES } from './constant'; import { decodeName, ENCODE_NAME_PREFIX } from '@module-federation/sdk'; +import { updateRemoteOptions } from './updateOptions'; export function remotes(options: RemotesOptions) { + updateRemoteOptions(options); + const { chunkId, promises, + webpackRequire, chunkMapping, idToExternalAndNameMapping, - webpackRequire, idToRemoteMap, } = options; attachShareScopeMap(webpackRequire); @@ -22,7 +25,7 @@ export function remotes(options: RemotesOptions) { getScope = []; } const data = idToExternalAndNameMapping[id]; - const remoteInfos = idToRemoteMap[id]; + const remoteInfos = idToRemoteMap[id] || []; // @ts-ignore seems not work if (getScope.indexOf(data) >= 0) { return; diff --git a/packages/webpack-bundler-runtime/src/types.ts b/packages/webpack-bundler-runtime/src/types.ts index 4905a1806b9..f0aac485176 100644 --- a/packages/webpack-bundler-runtime/src/types.ts +++ b/packages/webpack-bundler-runtime/src/types.ts @@ -1,11 +1,13 @@ import * as runtime from '@module-federation/runtime'; import type { + Remote, RemoteEntryInitOptions, SharedConfig, } from '@module-federation/runtime/types'; import { initializeSharing } from './initializeSharing'; import { attachShareScopeMap } from './attachShareScopeMap'; import { initContainerEntry } from './initContainerEntry'; +import type { moduleFederationPlugin } from '@module-federation/sdk'; // FIXME: ideal situation => import { GlobalShareScope,UserOptions } from '@module-federation/runtime/types' type ExcludeUndefined = T extends undefined ? never : T; @@ -13,7 +15,11 @@ type Shared = InitOptions['shared']; type NonUndefined = ExcludeUndefined; -type InitOptions = Parameters[0]; +type InitOptions = Omit[0], 'remotes'> & { + remotes: Array< + Remote & { externalType: moduleFederationPlugin.ExternalsType } + >; +}; type ModuleCache = runtime.ModuleFederation['moduleCache']; type InferModule = T extends Map ? U : never; @@ -47,11 +53,37 @@ type InferredGlobalShareScope = { // shareScope, name, externalModuleId type IdToExternalAndNameMappingItem = [string, string, string | number]; - interface IdToExternalAndNameMappingItemWithPromise extends IdToExternalAndNameMappingItem { p?: Promise | number; } +export type IdToExternalAndNameMapping = Record< + string, + IdToExternalAndNameMappingItemWithPromise +>; + +export type ModuleId = string | number; + +export type RemoteDataItem = { + shareScope: string; + name: string; + externalModuleId: ModuleId; + remoteName: string; +}; +export type ModuleIdToRemoteDataMapping = Record; + +// It will update while lazy compile +export type ConsumesLoadingData = { + chunkMapping?: Record>; + moduleIdToConsumeDataMapping?: Record; + initialConsumes?: Array; +}; + +// It will update while lazy compile +export type RemotesLoadingData = { + chunkMapping?: Record>; + moduleIdToRemoteDataMapping?: ModuleIdToRemoteDataMapping; +}; export interface WebpackRequire { (moduleId: string | number): any; @@ -66,6 +98,8 @@ export interface WebpackRequire { ) => ReturnType; S?: InferredGlobalShareScope; federation: Federation; + consumesLoadingData?: ConsumesLoadingData; + remotesLoadingData?: RemotesLoadingData; } interface ShareInfo { @@ -80,23 +114,36 @@ interface ModuleToHandlerMappingItem { shareKey: string; } -interface IdToRemoteMapItem { +export interface IdToRemoteMapItem { externalType: string; name: string; - externalModuleId?: string | number; } -export interface RemotesOptions { +export type IdToRemoteMap = Record; + +export type RemoteInfos = Record< + string, + Array< + IdToRemoteMapItem & { + alias: string; + entry?: string; + shareScope: string; + } + > +>; +export type RemoteChunkMapping = Record>; + +export type CoreRemotesOptions = { + idToRemoteMap: IdToRemoteMap; + chunkMapping: RemoteChunkMapping; + idToExternalAndNameMapping: IdToExternalAndNameMapping; +}; + +export type RemotesOptions = { chunkId: string | number; promises: Promise[]; - chunkMapping: Record>; - idToExternalAndNameMapping: Record< - string, - IdToExternalAndNameMappingItemWithPromise - >; - idToRemoteMap: Record; webpackRequire: WebpackRequire; -} +} & CoreRemotesOptions; export interface HandleInitialConsumesOptions { moduleId: string | number; @@ -140,7 +187,9 @@ export interface Federation { initContainerEntry: typeof initContainerEntry; }; bundlerRuntimeOptions: { - remotes?: Exclude; + remotes?: Exclude & { + remoteInfos?: RemoteInfos; + }; }; attachShareScopeMap?: typeof attachShareScopeMap; hasAttachShareScopeMap?: boolean; diff --git a/packages/webpack-bundler-runtime/src/updateOptions.ts b/packages/webpack-bundler-runtime/src/updateOptions.ts new file mode 100644 index 00000000000..60a14e5ee2c --- /dev/null +++ b/packages/webpack-bundler-runtime/src/updateOptions.ts @@ -0,0 +1,85 @@ +import { + IdToRemoteMapItem, + RemotesOptions, + InstallInitialConsumesOptions, + ConsumesOptions, +} from './types'; + +export function updateConsumeOptions( + options: InstallInitialConsumesOptions | ConsumesOptions, +) { + const { webpackRequire, moduleToHandlerMapping } = options; + const { consumesLoadingData } = webpackRequire; + if (!consumesLoadingData) { + return; + } + + const { + moduleIdToConsumeDataMapping: updatedModuleIdToConsumeDataMapping = {}, + initialConsumes: updatedInitialConsumes = [], + chunkMapping: updatedChunkMapping = {}, + } = consumesLoadingData; + + Object.entries(updatedModuleIdToConsumeDataMapping).forEach(([id, data]) => { + if (!moduleToHandlerMapping[id]) { + moduleToHandlerMapping[id] = data; + } + }); + + if ('initialConsumes' in options) { + const { initialConsumes = [] } = options; + updatedInitialConsumes.forEach((id) => { + if (!initialConsumes.includes(id)) { + initialConsumes.push(id); + } + }); + } + + if ('chunkMapping' in options) { + const { chunkMapping = {} } = options; + Object.entries(chunkMapping).forEach(([id, chunkModules]) => { + if (!updatedChunkMapping[id]) { + updatedChunkMapping[id] = []; + } + chunkModules.forEach((moduleId) => { + if (!updatedChunkMapping[id].includes(moduleId)) { + updatedChunkMapping[id].push(moduleId); + } + }); + }); + } +} + +export function updateRemoteOptions(options: RemotesOptions) { + const { + webpackRequire, + idToExternalAndNameMapping = {}, + idToRemoteMap = {}, + chunkMapping = {}, + } = options; + const { remotesLoadingData } = webpackRequire; + const remoteInfos = + webpackRequire.federation?.bundlerRuntimeOptions?.remotes?.remoteInfos; + if (!remotesLoadingData || !remoteInfos) { + return; + } + const { chunkMapping: updatedChunkMapping, moduleIdToRemoteDataMapping } = + remotesLoadingData; + if (!updatedChunkMapping || !moduleIdToRemoteDataMapping) { + return; + } + for (let [moduleId, data] of Object.entries(moduleIdToRemoteDataMapping)) { + if (!idToExternalAndNameMapping[moduleId]) { + idToExternalAndNameMapping[moduleId] = [ + data.shareScope, + data.name, + data.externalModuleId, + ]; + } + if (!idToRemoteMap[moduleId] && remoteInfos[data.remoteName]) { + const item = remoteInfos[data.remoteName]; + idToRemoteMap[moduleId] ||= []; + idToRemoteMap[moduleId].push(item as unknown as IdToRemoteMapItem); + } + } +} From 2926008b8e4483d244c98b5aa5e34d35b1764eb0 Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Sun, 28 Sep 2025 18:43:02 +0800 Subject: [PATCH 02/10] chore: split unit test --- packages/enhanced/jest.config.ts | 12 ++- packages/enhanced/package.json | 3 +- packages/enhanced/project.json | 6 +- .../sharing/resolveMatchedConfigs.test.ts | 5 +- pnpm-lock.yaml | 101 ++++++++++++------ 5 files changed, 83 insertions(+), 44 deletions(-) diff --git a/packages/enhanced/jest.config.ts b/packages/enhanced/jest.config.ts index 05e682332aa..a973ddb7077 100644 --- a/packages/enhanced/jest.config.ts +++ b/packages/enhanced/jest.config.ts @@ -23,6 +23,13 @@ if (swcJestConfig.swcrc === undefined) { // jest needs EsModule Interop to find the default exported setup/teardown functions // swcJestConfig.module.noInterop = false; +const testMatch = []; + +if (process.env['TEST_TYPE'] === 'unit') { + testMatch.push('/test/unit/**/*.test.ts'); +} else { + testMatch.push('/test/*.basictest.js'); +} export default { displayName: 'enhanced', preset: '../../jest.preset.js', @@ -33,10 +40,7 @@ export default { moduleFileExtensions: ['ts', 'js', 'html'], coverageDirectory: '../../coverage/packages/enhanced', rootDir: __dirname, - testMatch: [ - '/test/unit/**/*.test.ts', - '/test/*.basictest.js', - ], + testMatch, silent: true, verbose: false, testEnvironment: path.resolve(__dirname, './test/patch-node-env.js'), diff --git a/packages/enhanced/package.json b/packages/enhanced/package.json index 9797119ed30..c9cfbd8df74 100644 --- a/packages/enhanced/package.json +++ b/packages/enhanced/package.json @@ -87,7 +87,8 @@ "@types/btoa": "^1.2.5", "ajv": "^8.17.1", "enhanced-resolve": "^5.0.0", - "terser": "^5.37.0" + "terser": "^5.37.0", + "memfs": "4.46.0" }, "dependencies": { "@module-federation/bridge-react-webpack-plugin": "workspace:*", diff --git a/packages/enhanced/project.json b/packages/enhanced/project.json index d3d73607c2d..4730f4dbe0d 100644 --- a/packages/enhanced/project.json +++ b/packages/enhanced/project.json @@ -49,7 +49,11 @@ "parallel": false, "commands": [ { - "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", + "command": "TEST_TYPE=basic 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", + "forwardAllArgs": false + }, + { + "command": "TEST_TYPE=unit 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", "forwardAllArgs": false } ] diff --git a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts index a9a97fc5bc1..88d1b618622 100644 --- a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts +++ b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts @@ -7,10 +7,7 @@ import { resolveMatchedConfigs } from '../../../src/lib/sharing/resolveMatchedCo import type { ConsumeOptions } from '../../../src/declarations/plugins/sharing/ConsumeSharedModule'; jest.mock('@module-federation/sdk/normalize-webpack-path', () => ({ - normalizeWebpackPath: jest.fn((path) => { - console.log('real path: ', path); - return path; - }), + normalizeWebpackPath: jest.fn((path) => path), })); // Mock webpack classes diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 178453b1d88..88c69334cff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3165,6 +3165,9 @@ importers: enhanced-resolve: specifier: ^5.0.0 version: 5.17.1 + memfs: + specifier: 4.46.0 + version: 4.46.0 terser: specifier: ^5.37.0 version: 5.37.0 @@ -9219,24 +9222,55 @@ packages: dependencies: tslib: 2.8.1 - /@jsonjoy.com/json-pack@1.1.0(tslib@2.8.1): - resolution: {integrity: sha512-zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==} + /@jsonjoy.com/buffers@1.0.0(tslib@2.8.1): + resolution: {integrity: sha512-NDigYR3PHqCnQLXYyoLbnEdzMMvzeiCWo1KOut7Q0CoIqg9tUAPKJ1iq/2nFhc5kZtexzutNY0LFjdwWL3Dw3Q==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + dependencies: + tslib: 2.8.1 + + /@jsonjoy.com/codegen@1.0.0(tslib@2.8.1): + resolution: {integrity: sha512-E8Oy+08cmCf0EK/NMxpaJZmOxPqM+6iSe2S4nlSBrPZOORoDJILxtbSUEDKQyTamm/BVAhIGllOBNU79/dwf0g==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + dependencies: + tslib: 2.8.1 + + /@jsonjoy.com/json-pack@1.14.0(tslib@2.8.1): + resolution: {integrity: sha512-LpWbYgVnKzphN5S6uss4M25jJ/9+m6q6UJoeN6zTkK4xAGhKsiBRPVeF7OYMWonn5repMQbE5vieRXcMUrKDKw==} engines: {node: '>=10.0'} peerDependencies: tslib: '2' dependencies: '@jsonjoy.com/base64': 1.1.2(tslib@2.8.1) - '@jsonjoy.com/util': 1.3.0(tslib@2.8.1) + '@jsonjoy.com/buffers': 1.0.0(tslib@2.8.1) + '@jsonjoy.com/codegen': 1.0.0(tslib@2.8.1) + '@jsonjoy.com/json-pointer': 1.0.2(tslib@2.8.1) + '@jsonjoy.com/util': 1.9.0(tslib@2.8.1) hyperdyperid: 1.2.0 - thingies: 1.21.0(tslib@2.8.1) + thingies: 2.5.0(tslib@2.8.1) + tslib: 2.8.1 + + /@jsonjoy.com/json-pointer@1.0.2(tslib@2.8.1): + resolution: {integrity: sha512-Fsn6wM2zlDzY1U+v4Nc8bo3bVqgfNTGcn6dMgs6FjrEnt4ZCe60o6ByKRjOGlI2gow0aE/Q41QOigdTqkyK5fg==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + dependencies: + '@jsonjoy.com/codegen': 1.0.0(tslib@2.8.1) + '@jsonjoy.com/util': 1.9.0(tslib@2.8.1) tslib: 2.8.1 - /@jsonjoy.com/util@1.3.0(tslib@2.8.1): - resolution: {integrity: sha512-Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw==} + /@jsonjoy.com/util@1.9.0(tslib@2.8.1): + resolution: {integrity: sha512-pLuQo+VPRnN8hfPqUTLTHk126wuYdXVxE6aDmjSeV4NCAgyxWbiOIeNJVtID3h1Vzpoi9m4jXezf73I6LgabgQ==} engines: {node: '>=10.0'} peerDependencies: tslib: '2' dependencies: + '@jsonjoy.com/buffers': 1.0.0(tslib@2.8.1) + '@jsonjoy.com/codegen': 1.0.0(tslib@2.8.1) tslib: 2.8.1 /@juggle/resize-observer@3.4.0: @@ -23459,7 +23493,7 @@ packages: '@vue/compiler-ssr': 3.5.18 '@vue/shared': 3.5.18 estree-walker: 2.0.2 - magic-string: 0.30.17 + magic-string: 0.30.18 postcss: 8.5.6 source-map-js: 1.2.1 dev: true @@ -32157,6 +32191,14 @@ packages: dependencies: is-glob: 4.0.3 + /glob-to-regex.js@1.0.1(tslib@2.8.1): + resolution: {integrity: sha512-CG/iEvgQqfzoVsMUbxSJcwbG2JwyZ3naEqPkeltwl0BSS8Bp83k3xlGms+0QdWFUAwV+uvo80wNswKF6FWEkKg==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + dependencies: + tslib: 2.8.1 + /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} @@ -36411,23 +36453,14 @@ packages: dependencies: fs-monkey: 1.0.6 - /memfs@4.17.0: - resolution: {integrity: sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==} - engines: {node: '>= 4.0.0'} - dependencies: - '@jsonjoy.com/json-pack': 1.1.0(tslib@2.8.1) - '@jsonjoy.com/util': 1.3.0(tslib@2.8.1) - tree-dump: 1.0.2(tslib@2.8.1) - tslib: 2.8.1 - dev: true - - /memfs@4.36.0: - resolution: {integrity: sha512-mfBfzGUdoEw5AZwG8E965ej3BbvW2F9LxEWj4uLxF6BEh1dO2N9eS3AGu9S6vfenuQYrVjsbUOOZK7y3vz4vyQ==} - engines: {node: '>= 4.0.0'} + /memfs@4.46.0: + resolution: {integrity: sha512-//IxqL9OO/WMpm2kE2aq+y7vO7/xS9xgVIbFM8RUIfW7TY7lowtnuS1j9MwLGm0OwcHUa4p8Bp+40W7f1BiWGQ==} dependencies: - '@jsonjoy.com/json-pack': 1.1.0(tslib@2.8.1) - '@jsonjoy.com/util': 1.3.0(tslib@2.8.1) - tree-dump: 1.0.2(tslib@2.8.1) + '@jsonjoy.com/json-pack': 1.14.0(tslib@2.8.1) + '@jsonjoy.com/util': 1.9.0(tslib@2.8.1) + glob-to-regex.js: 1.0.1(tslib@2.8.1) + thingies: 2.5.0(tslib@2.8.1) + tree-dump: 1.1.0(tslib@2.8.1) tslib: 2.8.1 /memoize-one@5.2.1: @@ -45962,7 +45995,7 @@ packages: es-module-lexer: 1.7.0 find-cache-dir: 5.0.0 fs-extra: 11.3.0 - magic-string: 0.30.17 + magic-string: 0.30.18 path-browserify: 1.0.1 process: 0.11.10 react: 18.3.1 @@ -47334,8 +47367,8 @@ packages: dependencies: any-promise: 1.3.0 - /thingies@1.21.0(tslib@2.8.1): - resolution: {integrity: sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==} + /thingies@2.5.0(tslib@2.8.1): + resolution: {integrity: sha512-s+2Bwztg6PhWUD7XMfeYm5qliDdSiZm7M7n8KjTkIsm3l/2lgVRc2/Gx/v+ZX8lT4FMA+i8aQvhcWylldc+ZNw==} engines: {node: '>=10.18'} peerDependencies: tslib: ^2 @@ -47576,8 +47609,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /tree-dump@1.0.2(tslib@2.8.1): - resolution: {integrity: sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==} + /tree-dump@1.1.0(tslib@2.8.1): + resolution: {integrity: sha512-rMuvhU4MCDbcbnleZTFezWsaZXRFemSqAM+7jPnzUl1fo9w3YEKOxAeui0fz3OI4EU4hf23iyA7uQRVko+UaBA==} engines: {node: '>=10.0'} peerDependencies: tslib: '2' @@ -47649,7 +47682,7 @@ packages: '@rspack/lite-tapable': 1.0.1 chokidar: 3.6.0 is-glob: 4.0.3 - memfs: 4.17.0 + memfs: 4.46.0 minimatch: 9.0.5 picocolors: 1.1.1 typescript: 5.8.3 @@ -47670,7 +47703,7 @@ packages: '@rspack/lite-tapable': 1.0.1 chokidar: 3.6.0 is-glob: 4.0.3 - memfs: 4.36.0 + memfs: 4.46.0 minimatch: 9.0.5 picocolors: 1.1.1 typescript: 5.0.4 @@ -47691,7 +47724,7 @@ packages: '@rspack/lite-tapable': 1.0.1 chokidar: 3.6.0 is-glob: 4.0.3 - memfs: 4.36.0 + memfs: 4.46.0 minimatch: 9.0.5 picocolors: 1.1.1 typescript: 5.5.2 @@ -47712,7 +47745,7 @@ packages: '@rspack/lite-tapable': 1.0.1 chokidar: 3.6.0 is-glob: 4.0.3 - memfs: 4.36.0 + memfs: 4.46.0 minimatch: 9.0.5 picocolors: 1.1.1 typescript: 5.8.3 @@ -49963,7 +49996,7 @@ packages: optional: true dependencies: colorette: 2.0.20 - memfs: 4.36.0 + memfs: 4.46.0 mime-types: 2.1.35 on-finished: 2.4.1 range-parser: 1.2.1 @@ -49980,7 +50013,7 @@ packages: optional: true dependencies: colorette: 2.0.20 - memfs: 4.36.0 + memfs: 4.46.0 mime-types: 2.1.35 on-finished: 2.4.1 range-parser: 1.2.1 From 5b2951ee270832879e3bab8f4e53a3dec3a1cfd0 Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Sun, 28 Sep 2025 18:53:35 +0800 Subject: [PATCH 03/10] chore: update cahe directory --- packages/enhanced/jest.config.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/enhanced/jest.config.ts b/packages/enhanced/jest.config.ts index a973ddb7077..ef3a9c4e71f 100644 --- a/packages/enhanced/jest.config.ts +++ b/packages/enhanced/jest.config.ts @@ -30,10 +30,15 @@ if (process.env['TEST_TYPE'] === 'unit') { } else { testMatch.push('/test/*.basictest.js'); } + export default { displayName: 'enhanced', preset: '../../jest.preset.js', - cacheDirectory: path.join(os.tmpdir(), 'enhanced'), + cacheDirectory: path.join( + os.tmpdir(), + process.env['TEST_TYPE'] || '', + 'enhanced', + ), transform: { '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig], }, From b5caf98ebc94dc8c99cdf536dd5cafa595d35c8b Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Sun, 28 Sep 2025 19:24:55 +0800 Subject: [PATCH 04/10] fix: update insert target object --- .../src/updateOptions.ts | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/packages/webpack-bundler-runtime/src/updateOptions.ts b/packages/webpack-bundler-runtime/src/updateOptions.ts index 60a14e5ee2c..4b33886e131 100644 --- a/packages/webpack-bundler-runtime/src/updateOptions.ts +++ b/packages/webpack-bundler-runtime/src/updateOptions.ts @@ -37,13 +37,13 @@ export function updateConsumeOptions( if ('chunkMapping' in options) { const { chunkMapping = {} } = options; - Object.entries(chunkMapping).forEach(([id, chunkModules]) => { - if (!updatedChunkMapping[id]) { - updatedChunkMapping[id] = []; + Object.entries(updatedChunkMapping).forEach(([id, chunkModules]) => { + if (!chunkMapping[id]) { + chunkMapping[id] = []; } chunkModules.forEach((moduleId) => { - if (!updatedChunkMapping[id].includes(moduleId)) { - updatedChunkMapping[id].push(moduleId); + if (!chunkMapping[id].includes(moduleId)) { + chunkMapping[id].push(moduleId); } }); }); @@ -82,4 +82,17 @@ export function updateRemoteOptions(options: RemotesOptions) { idToRemoteMap[moduleId].push(item as unknown as IdToRemoteMapItem); } } + + if (chunkMapping) { + Object.entries(updatedChunkMapping).forEach(([id, chunkModules]) => { + if (!chunkMapping[id]) { + chunkMapping[id] = []; + } + chunkModules.forEach((moduleId) => { + if (!chunkMapping[id].includes(moduleId)) { + chunkMapping[id].push(moduleId); + } + }); + }); + } } From aa99dd304af2ca3dab5c1d607d9506db34d57de4 Mon Sep 17 00:00:00 2001 From: Zack Jackson <25274700+ScriptedAlchemy@users.noreply.github.com> Date: Sun, 28 Sep 2025 19:50:28 -0700 Subject: [PATCH 05/10] fix(enhanced): isolate Jest modules and improve runtime compat (#4107) --- packages/enhanced/jest.config.ts | 5 ++ .../src/lib/container/RemoteRuntimeModule.ts | 4 +- .../runtime/FederationModulesPlugin.ts | 15 +++- ...nModulesPlugin.getCompilationHooks.test.ts | 39 +++++++++++ .../container/RemoteRuntimeModule.test.ts | 4 ++ .../sharing/resolveMatchedConfigs.test.ts | 68 ++++++++++++------- 6 files changed, 109 insertions(+), 26 deletions(-) create mode 100644 packages/enhanced/test/unit/container/FederationModulesPlugin.getCompilationHooks.test.ts diff --git a/packages/enhanced/jest.config.ts b/packages/enhanced/jest.config.ts index ef3a9c4e71f..e9f78245ad8 100644 --- a/packages/enhanced/jest.config.ts +++ b/packages/enhanced/jest.config.ts @@ -34,6 +34,8 @@ if (process.env['TEST_TYPE'] === 'unit') { export default { displayName: 'enhanced', preset: '../../jest.preset.js', + // Disable Jest's filesystem transform cache to avoid stale results + cache: false, cacheDirectory: path.join( os.tmpdir(), process.env['TEST_TYPE'] || '', @@ -48,6 +50,9 @@ export default { testMatch, silent: true, verbose: false, + // Note: Do not enable `resetModules` here. Some unit tests rely on hoisted + // jest.mock() semantics across ESM/CJS boundaries, and forcing a registry + // reset can interfere with those mocks being applied at import time. testEnvironment: path.resolve(__dirname, './test/patch-node-env.js'), setupFilesAfterEnv: ['/test/setupTestFramework.js'], }; diff --git a/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts b/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts index b7e42132ad1..d6a3b88b947 100644 --- a/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts +++ b/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts @@ -123,7 +123,9 @@ class RemoteRuntimeModule extends RuntimeModule { shareScope: shareScope as string, name, externalModuleId: externalModuleId as string, - remoteName: '', + // Preserve the extracted remote name so lazy updates can + // rebuild idToRemoteMap via updateRemoteOptions. + remoteName: remoteName, }; }); } diff --git a/packages/enhanced/src/lib/container/runtime/FederationModulesPlugin.ts b/packages/enhanced/src/lib/container/runtime/FederationModulesPlugin.ts index 3e7eb12ea21..8bb09cda321 100644 --- a/packages/enhanced/src/lib/container/runtime/FederationModulesPlugin.ts +++ b/packages/enhanced/src/lib/container/runtime/FederationModulesPlugin.ts @@ -29,9 +29,20 @@ class FederationModulesPlugin { * @returns {CompilationHooks} the attached hooks */ static getCompilationHooks(compilation: CompilationType): CompilationHooks { - if (!(compilation instanceof Compilation)) { + // Avoid cross-realm instanceof checks (e.g., Jest VM modules) by using + // a duck-typed verification of a Webpack Compilation-like object. + const isLikelyCompilation = + compilation && + typeof compilation === 'object' && + // @ts-ignore + typeof (compilation as any).hooks === 'object' && + // A couple of well-known hooks available on Webpack 5 compilations + // @ts-ignore + typeof (compilation as any).hooks.processAssets?.tap === 'function'; + + if (!isLikelyCompilation) { throw new TypeError( - "The 'compilation' argument must be an instance of Compilation", + "Invalid 'compilation' argument: expected a Webpack Compilation-like object", ); } let hooks = compilationHooksMap.get(compilation); diff --git a/packages/enhanced/test/unit/container/FederationModulesPlugin.getCompilationHooks.test.ts b/packages/enhanced/test/unit/container/FederationModulesPlugin.getCompilationHooks.test.ts new file mode 100644 index 00000000000..d207ae46029 --- /dev/null +++ b/packages/enhanced/test/unit/container/FederationModulesPlugin.getCompilationHooks.test.ts @@ -0,0 +1,39 @@ +/* + * @jest-environment node + */ + +// Make normalizeWebpackPath identity so our virtual mocks resolve +jest.mock('@module-federation/sdk/normalize-webpack-path', () => ({ + normalizeWebpackPath: jest.fn((p: string) => p), +})); + +// Provide a virtual Compilation module so the import in the SUT doesn't throw +jest.mock('webpack/lib/Compilation', () => ({}), { virtual: true }); + +const FederationModulesPlugin = + require('../../../src/lib/container/runtime/FederationModulesPlugin').default; + +describe('FederationModulesPlugin.getCompilationHooks', () => { + it('returns stable hooks for a Compilation-like object', () => { + const compilation = { + hooks: { + processAssets: { tap: jest.fn() }, + }, + } as any; + + const hooks1 = FederationModulesPlugin.getCompilationHooks(compilation); + const hooks2 = FederationModulesPlugin.getCompilationHooks(compilation); + + expect(hooks1).toBe(hooks2); + expect(typeof hooks1.addContainerEntryDependency.tap).toBe('function'); + expect(typeof hooks1.addFederationRuntimeDependency.tap).toBe('function'); + expect(typeof hooks1.addRemoteDependency.tap).toBe('function'); + }); + + it('throws TypeError for invalid compilation shape', () => { + const badCompilation = { hooks: {} } as any; + expect(() => + FederationModulesPlugin.getCompilationHooks(badCompilation), + ).toThrow(TypeError); + }); +}); diff --git a/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts b/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts index 435ab10e61b..69a0808c6a5 100644 --- a/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts +++ b/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts @@ -238,6 +238,10 @@ describe('RemoteRuntimeModule', () => { // Verify federation global scope is used expect(result).toContain('__FEDERATION__.bundlerRuntimeOptions.remotes'); expect(result).toContain('__FEDERATION__.bundlerRuntime.remotes'); + + // Also ensure moduleIdToRemoteDataMapping preserves remoteName + expect(result).toContain('moduleIdToRemoteDataMapping'); + expect(result).toContain('"remoteName": "app1"'); }); it('should handle fallback modules with requests', () => { diff --git a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts index 88d1b618622..1549ea9d08d 100644 --- a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts +++ b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts @@ -3,7 +3,10 @@ * Testing all resolution paths: relative, absolute, prefix, and regular module requests */ -import { resolveMatchedConfigs } from '../../../src/lib/sharing/resolveMatchedConfigs'; +// Defer loading the module under test until after jest.mock() calls +// to ensure our mocks for webpack internals are applied consistently +// even when other suites import the module first in the same worker. +let resolveMatchedConfigs: typeof import('../../../src/lib/sharing/resolveMatchedConfigs').resolveMatchedConfigs; import type { ConsumeOptions } from '../../../src/declarations/plugins/sharing/ConsumeSharedModule'; jest.mock('@module-federation/sdk/normalize-webpack-path', () => ({ @@ -40,6 +43,13 @@ describe('resolveMatchedConfigs', () => { beforeEach(() => { jest.clearAllMocks(); + jest.resetModules(); + // Load the module after mocks are in place in isolated module context + jest.isolateModules(() => { + // eslint-disable-next-line @typescript-eslint/no-var-requires + resolveMatchedConfigs = + require('../../../src/lib/sharing/resolveMatchedConfigs').resolveMatchedConfigs; + }); // Get the mocked classes MockModuleNotFoundError = require('webpack/lib/ModuleNotFoundError'); @@ -72,6 +82,8 @@ describe('resolveMatchedConfigs', () => { MockLazySet.mockImplementation(() => mockResolveContext.fileDependencies); }); + // CI note: this suite avoids strict constructor identity checks because + // workers may load webpack classes in different realms. describe('relative path resolution', () => { it('should resolve relative paths successfully', async () => { const configs: [string, ConsumeOptions][] = [ @@ -138,14 +150,14 @@ describe('resolveMatchedConfigs', () => { expect(result.unresolved.size).toBe(0); expect(result.prefixed.size).toBe(0); expect(mockCompilation.errors).toHaveLength(1); - expect(MockModuleNotFoundError).toHaveBeenCalledWith(null, resolveError, { - name: 'shared module ./missing-module', - }); - expect(mockCompilation.errors[0]).toEqual({ - module: null, - err: resolveError, - details: { name: 'shared module ./missing-module' }, - }); + // Assert error message semantics without assuming exact error shape + const recordedErr: any = mockCompilation.errors[0]; + const errMsg = String(recordedErr?.message || recordedErr); + expect(errMsg).toMatch(/(Module not found|Can't resolve)/); + // Ensure the missing request is mentioned somewhere on the error + expect(errMsg + JSON.stringify(recordedErr)).toContain( + './missing-module', + ); }); it('should handle resolver returning false', async () => { @@ -163,18 +175,12 @@ describe('resolveMatchedConfigs', () => { expect(result.resolved.size).toBe(0); expect(mockCompilation.errors).toHaveLength(1); - expect(MockModuleNotFoundError).toHaveBeenCalledWith( - null, - expect.any(Error), - { name: 'shared module ./invalid-module' }, + const recordedErr2: any = mockCompilation.errors[0]; + const errMsg2 = String(recordedErr2?.message || recordedErr2); + expect(errMsg2).toMatch(/(Module not found|Can't resolve)/); + expect(errMsg2 + JSON.stringify(recordedErr2)).toContain( + './invalid-module', ); - expect(mockCompilation.errors[0]).toEqual({ - module: null, - err: expect.objectContaining({ - message: "Can't resolve ./invalid-module", - }), - details: { name: 'shared module ./invalid-module' }, - }); }); it('should handle relative path resolution with custom request', async () => { @@ -482,14 +488,30 @@ describe('resolveMatchedConfigs', () => { await resolveMatchedConfigs(mockCompilation, configs); + expect(mockCompilation.contextDependencies.addAll).toHaveBeenCalledTimes( + 1, + ); expect(mockCompilation.contextDependencies.addAll).toHaveBeenCalledWith( - resolveContext.contextDependencies, + expect.objectContaining({ + add: expect.any(Function), + addAll: expect.any(Function), + }), ); + expect(mockCompilation.fileDependencies.addAll).toHaveBeenCalledTimes(1); expect(mockCompilation.fileDependencies.addAll).toHaveBeenCalledWith( - resolveContext.fileDependencies, + expect.objectContaining({ + add: expect.any(Function), + addAll: expect.any(Function), + }), + ); + expect(mockCompilation.missingDependencies.addAll).toHaveBeenCalledTimes( + 1, ); expect(mockCompilation.missingDependencies.addAll).toHaveBeenCalledWith( - resolveContext.missingDependencies, + expect.objectContaining({ + add: expect.any(Function), + addAll: expect.any(Function), + }), ); }); }); From 6f3527ed40c422d5768377dbd4a4d5b15e0ad15b Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Sun, 28 Sep 2025 19:41:05 +0800 Subject: [PATCH 06/10] fix: idToRemoteMap type --- packages/webpack-bundler-runtime/src/updateOptions.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/webpack-bundler-runtime/src/updateOptions.ts b/packages/webpack-bundler-runtime/src/updateOptions.ts index 4b33886e131..350933b01b4 100644 --- a/packages/webpack-bundler-runtime/src/updateOptions.ts +++ b/packages/webpack-bundler-runtime/src/updateOptions.ts @@ -77,9 +77,13 @@ export function updateRemoteOptions(options: RemotesOptions) { ]; } if (!idToRemoteMap[moduleId] && remoteInfos[data.remoteName]) { - const item = remoteInfos[data.remoteName]; + const items = remoteInfos[data.remoteName]; idToRemoteMap[moduleId] ||= []; - idToRemoteMap[moduleId].push(item as unknown as IdToRemoteMapItem); + items.forEach((item) => { + if (!idToRemoteMap[moduleId].includes(item)) { + idToRemoteMap[moduleId].push(item); + } + }); } } From 11f4722bfb33f873752684aaefd0c9a2100edbac Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Mon, 29 Sep 2025 11:19:19 +0800 Subject: [PATCH 07/10] feat: initializeSharingData --- .../__tests__/updateOptions.test.ts | 219 ++++++++++++++++++ packages/webpack-bundler-runtime/src/types.ts | 26 ++- .../src/updateOptions.ts | 134 ++++++++--- 3 files changed, 342 insertions(+), 37 deletions(-) diff --git a/packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts b/packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts index 84d5839cf73..d2aee354d93 100644 --- a/packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts +++ b/packages/webpack-bundler-runtime/__tests__/updateOptions.test.ts @@ -82,6 +82,109 @@ describe('updateOptions', () => { module1: { shareScope: 'default', name: 'react' } as any, }); }); + + it('should skip when _updated flag is set', () => { + const mockWebpackRequire = { + consumesLoadingData: { + _updated: 1, + moduleIdToConsumeDataMapping: { + module1: { shareScope: 'default', name: 'react' }, + }, + initialConsumes: ['module1'], + }, + } as any; + + const options: InstallInitialConsumesOptions = { + webpackRequire: mockWebpackRequire, + moduleToHandlerMapping: {}, + installedModules: {}, + initialConsumes: [], + }; + + updateConsumeOptions(options); + + expect(options.moduleToHandlerMapping).toEqual({}); + expect(options.initialConsumes).toEqual([]); + }); + + // 新增测试：initializeSharingData 处理 + it('should handle initializeSharingData', () => { + const mockRegisterShared = jest.fn(); + const mockWebpackRequire = { + consumesLoadingData: {}, + initializeSharingData: { + scopeToSharingDataMapping: { + default: [ + { + name: 'react', + version: '18.0.0', + factory: () => ({}), + singleton: true, + eager: false, + }, + ], + }, + }, + federation: { + instance: { + registerShared: mockRegisterShared, + }, + }, + } as any; + + const options: InstallInitialConsumesOptions = { + webpackRequire: mockWebpackRequire, + moduleToHandlerMapping: {}, + installedModules: {}, + initialConsumes: [], + }; + + updateConsumeOptions(options); + + expect(mockRegisterShared).toHaveBeenCalledWith({ + react: [ + { + version: '18.0.0', + scope: ['default'], + shareConfig: { + requiredVersion: '^18.0.0', + singleton: true, + eager: false, + }, + get: expect.any(Function), + }, + ], + }); + }); + + // 新增测试：initializeSharingData 跳过已更新 + it('should skip initializeSharingData when _updated flag is set', () => { + const mockRegisterShared = jest.fn(); + const mockWebpackRequire = { + initializeSharingData: { + _updated: 1, + scopeToSharingDataMapping: { + default: [{ name: 'react', version: '18.0.0' }], + }, + }, + federation: { + instance: { + registerShared: mockRegisterShared, + }, + }, + } as any; + + const options: InstallInitialConsumesOptions = { + webpackRequire: mockWebpackRequire, + moduleToHandlerMapping: {}, + installedModules: {}, + initialConsumes: [], + }; + + updateConsumeOptions(options); + + expect(mockRegisterShared).not.toHaveBeenCalled(); + }); }); describe('updateRemoteOptions', () => { @@ -219,5 +322,121 @@ describe('updateOptions', () => { }); expect(options.idToRemoteMap).toEqual({}); }); + + // 新增测试：_updated 标志 + it('should skip when _updated flag is set', () => { + const mockWebpackRequire = { + remotesLoadingData: { + _updated: 1, + chunkMapping: { remote1: ['chunk1'] }, + moduleIdToRemoteDataMapping: { + remoteModule1: { + shareScope: 'default', + name: 'react', + remoteName: 'reactRemote', + externalModuleId: 'react-external', + }, + }, + }, + } as any; + + const options: RemotesOptions = { + webpackRequire: mockWebpackRequire, + chunkId: 'test-chunk', + promises: [], + idToExternalAndNameMapping: {}, + idToRemoteMap: {}, + chunkMapping: {}, + }; + + updateRemoteOptions(options); + + expect(options.idToExternalAndNameMapping).toEqual({}); + expect(options.idToRemoteMap).toEqual({}); + }); + + // 新增测试：chunkMapping 更新 + it('should update chunkMapping correctly', () => { + const mockWebpackRequire = { + remotesLoadingData: { + chunkMapping: { + chunk1: ['module1', 'module2'], + chunk2: ['module3'], + }, + moduleIdToRemoteDataMapping: {}, + }, + } as any; + + const options: RemotesOptions = { + webpackRequire: mockWebpackRequire, + chunkId: 'test-chunk', + promises: [], + idToExternalAndNameMapping: {}, + idToRemoteMap: {}, + chunkMapping: { + chunk3: ['module4'], + }, + }; + + updateRemoteOptions(options); + + expect(options.chunkMapping).toEqual({ + chunk3: ['module4'], + chunk1: ['module1', 'module2'], + chunk2: ['module3'], + }); + }); + + // 新增测试：多个远程项 + it('should handle multiple remote items', () => { + const mockWebpackRequire = { + remotesLoadingData: { + moduleIdToRemoteDataMapping: { + module1: { + shareScope: 'default', + name: 'react', + remoteName: 'reactRemote', + externalModuleId: 'react-external', + }, + module2: { + shareScope: 'custom', + name: 'lodash', + remoteName: 'lodashRemote', + externalModuleId: 'lodash-external', + }, + }, + }, + federation: { + bundlerRuntimeOptions: { + remotes: { + remoteInfos: { + reactRemote: [ + { url: 'http://react.com', name: 'react' }, + ] as any, + lodashRemote: [ + { url: 'http://lodash.com', name: 'lodash' }, + ] as any, + }, + }, + }, + }, + } as any; + + const options: RemotesOptions = { + webpackRequire: mockWebpackRequire, + chunkId: 'test-chunk', + promises: [], + idToExternalAndNameMapping: {}, + idToRemoteMap: {}, + chunkMapping: {}, + }; + + updateRemoteOptions(options); + + expect(options.idToExternalAndNameMapping).toEqual({ + module1: ['default', 'react', 'react-external'], + module2: ['custom', 'lodash', 'lodash-external'], + }); + }); }); }); diff --git a/packages/webpack-bundler-runtime/src/types.ts b/packages/webpack-bundler-runtime/src/types.ts index f0aac485176..431e8668838 100644 --- a/packages/webpack-bundler-runtime/src/types.ts +++ b/packages/webpack-bundler-runtime/src/types.ts @@ -3,6 +3,7 @@ import type { Remote, RemoteEntryInitOptions, SharedConfig, + SharedGetter, } from '@module-federation/runtime/types'; import { initializeSharing } from './initializeSharing'; import { attachShareScopeMap } from './attachShareScopeMap'; @@ -72,18 +73,34 @@ export type RemoteDataItem = { }; export type ModuleIdToRemoteDataMapping = Record; +type WithStatus = T & { _updated: number }; // It will update while lazy compile -export type ConsumesLoadingData = { +export type ConsumesLoadingData = WithStatus<{ chunkMapping?: Record>; moduleIdToConsumeDataMapping?: Record; initialConsumes?: Array; -}; +}>; // It will update while lazy compile -export type RemotesLoadingData = { +export type RemotesLoadingData = WithStatus<{ chunkMapping?: Record>; moduleIdToRemoteDataMapping?: ModuleIdToRemoteDataMapping; -}; +}>; + +export type InitializeSharingData = WithStatus<{ + scopeToSharingDataMapping: { + [shareScope: string]: Array<{ + name: string; + version: string; + factory: SharedGetter; + eager?: boolean; + singleton?: boolean; + requiredVersion?: string; + strictVersion?: boolean; + }>; + }; + uniqueName: string; +}>; export interface WebpackRequire { (moduleId: string | number): any; @@ -100,6 +117,7 @@ export interface WebpackRequire { federation: Federation; consumesLoadingData?: ConsumesLoadingData; remotesLoadingData?: RemotesLoadingData; + initializeSharingData?: InitializeSharingData; } interface ShareInfo { diff --git a/packages/webpack-bundler-runtime/src/updateOptions.ts b/packages/webpack-bundler-runtime/src/updateOptions.ts index 350933b01b4..1936735e19c 100644 --- a/packages/webpack-bundler-runtime/src/updateOptions.ts +++ b/packages/webpack-bundler-runtime/src/updateOptions.ts @@ -1,52 +1,119 @@ -import { +import type { IdToRemoteMapItem, RemotesOptions, InstallInitialConsumesOptions, ConsumesOptions, } from './types'; +import type { + UserOptions, + ShareArgs, + SharedConfig, +} from '@module-federation/runtime/types'; export function updateConsumeOptions( options: InstallInitialConsumesOptions | ConsumesOptions, ) { const { webpackRequire, moduleToHandlerMapping } = options; - const { consumesLoadingData } = webpackRequire; - if (!consumesLoadingData) { - return; - } + const { consumesLoadingData, initializeSharingData } = webpackRequire; + if (consumesLoadingData && !consumesLoadingData._updated) { + const { + moduleIdToConsumeDataMapping: updatedModuleIdToConsumeDataMapping = {}, + initialConsumes: updatedInitialConsumes = [], + chunkMapping: updatedChunkMapping = {}, + } = consumesLoadingData; - const { - moduleIdToConsumeDataMapping: updatedModuleIdToConsumeDataMapping = {}, - initialConsumes: updatedInitialConsumes = [], - chunkMapping: updatedChunkMapping = {}, - } = consumesLoadingData; + Object.entries(updatedModuleIdToConsumeDataMapping).forEach( + ([id, data]) => { + if (!moduleToHandlerMapping[id]) { + moduleToHandlerMapping[id] = data; + } + }, + ); - Object.entries(updatedModuleIdToConsumeDataMapping).forEach(([id, data]) => { - if (!moduleToHandlerMapping[id]) { - moduleToHandlerMapping[id] = data; + if ('initialConsumes' in options) { + const { initialConsumes = [] } = options; + updatedInitialConsumes.forEach((id) => { + if (!initialConsumes.includes(id)) { + initialConsumes.push(id); + } + }); } - }); - if ('initialConsumes' in options) { - const { initialConsumes = [] } = options; - updatedInitialConsumes.forEach((id) => { - if (!initialConsumes.includes(id)) { - initialConsumes.push(id); - } - }); + if ('chunkMapping' in options) { + const { chunkMapping = {} } = options; + Object.entries(updatedChunkMapping).forEach(([id, chunkModules]) => { + if (!chunkMapping[id]) { + chunkMapping[id] = []; + } + chunkModules.forEach((moduleId) => { + if (!chunkMapping[id].includes(moduleId)) { + chunkMapping[id].push(moduleId); + } + }); + }); + } + consumesLoadingData._updated = 1; } - if ('chunkMapping' in options) { - const { chunkMapping = {} } = options; - Object.entries(updatedChunkMapping).forEach(([id, chunkModules]) => { - if (!chunkMapping[id]) { - chunkMapping[id] = []; - } - chunkModules.forEach((moduleId) => { - if (!chunkMapping[id].includes(moduleId)) { - chunkMapping[id].push(moduleId); + if (initializeSharingData && !initializeSharingData._updated) { + const { federation } = webpackRequire; + if ( + !federation.instance || + !initializeSharingData.scopeToSharingDataMapping + ) { + return; + } + const shared: Record> = {}; + for (let [scope, stages] of Object.entries( + initializeSharingData.scopeToSharingDataMapping, + )) { + for (let stage of stages) { + if (typeof stage === 'object' && stage !== null) { + const { + name, + version, + factory, + eager, + singleton, + requiredVersion, + strictVersion, + } = stage; + const shareConfig: SharedConfig = { + requiredVersion: `^${version}`, + }; + const isValidValue = function ( + val: unknown, + ): val is NonNullable { + return typeof val !== 'undefined'; + }; + if (isValidValue(singleton)) { + shareConfig.singleton = singleton; + } + if (isValidValue(requiredVersion)) { + shareConfig.requiredVersion = requiredVersion; + } + if (isValidValue(eager)) { + shareConfig.eager = eager; + } + if (isValidValue(strictVersion)) { + shareConfig.strictVersion = strictVersion; + } + const options = { + version, + scope: [scope], + shareConfig, + get: factory, + }; + if (shared[name]) { + shared[name].push(options); + } else { + shared[name] = [options]; + } } - }); - }); + } + } + federation.instance.registerShared(shared); + initializeSharingData._updated = 1; } } @@ -60,7 +127,7 @@ export function updateRemoteOptions(options: RemotesOptions) { const { remotesLoadingData } = webpackRequire; const remoteInfos = webpackRequire.federation?.bundlerRuntimeOptions?.remotes?.remoteInfos; - if (!remotesLoadingData || !remoteInfos) { + if (!remotesLoadingData || remotesLoadingData._updated || !remoteInfos) { return; } const { chunkMapping: updatedChunkMapping, moduleIdToRemoteDataMapping } = @@ -99,4 +166,5 @@ export function updateRemoteOptions(options: RemotesOptions) { }); }); } + remotesLoadingData._updated = 1; } From f956c1a5428cf19f523f1e52d7bdd40da544e35e Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Tue, 30 Sep 2025 17:23:12 +0800 Subject: [PATCH 08/10] fix: correct moduleIdToConsumeDataMapping data structure --- .../lib/sharing/ConsumeSharedRuntimeModule.ts | 44 ++++++++----------- .../sharing/resolveMatchedConfigs.test.ts | 6 +-- packages/webpack-bundler-runtime/src/types.ts | 7 ++- .../src/updateOptions.ts | 17 ++++++- 4 files changed, 44 insertions(+), 30 deletions(-) diff --git a/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts b/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts index a5f1651346c..87080db82c8 100644 --- a/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts +++ b/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts @@ -61,38 +61,30 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { chunk.runtime, 'consume-shared', ); - const sharedInfoAndHandlerStr = Template.asString([ - '{', - Template.indent([ - `getter: ${moduleGetter.source().toString()},`, - `shareInfo: {`, + moduleIdToSourceMapping.set( + id, + Template.asString([ + '{', Template.indent([ - `shareConfig: ${JSON.stringify( - shareOption.shareConfig, - null, - 2, - )},`, - `scope: ${JSON.stringify( + `fallback: ${moduleGetter.source().toString()},`, + `shareScope: ${JSON.stringify( Array.isArray(shareOption.shareScope) ? shareOption.shareScope : [shareOption.shareScope || 'default'], )},`, + `singleton: ${JSON.stringify(shareOption.shareConfig.singleton)},`, + `requiredVersion: ${JSON.stringify(shareOption.shareConfig.requiredVersion)},`, + `strictVersion: ${JSON.stringify(shareOption.shareConfig.strictVersion)},`, + `eager: ${JSON.stringify(shareOption.shareConfig.eager)},`, + `layer: ${JSON.stringify(shareOption.shareConfig.layer)},`, + `shareKey: "${shareOption.shareKey}",`, ]), - '},', - `shareKey: "${shareOption.shareKey}",`, + '}', ]), - '}', - ]); - moduleIdToSourceMapping.set(id, sharedInfoAndHandlerStr); + ); } }; - // const chunkReferences = this._runtimeRequirements.has( - // 'federation-entry-startup', - // ) - // ? this.chunk?.getAllReferencedChunks() - // : this.chunk?.getAllAsyncChunks(); - // - // const allChunks = chunkReferences || []; + const allChunks = [...(this.chunk?.getAllReferencedChunks() || [])]; for (const chunk of allChunks) { const modules = chunkGraph.getChunkModulesIterableBySourceType( @@ -133,6 +125,8 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { ), '};', + `var moduleToHandlerMapping = {};`, + initialConsumes.length > 0 ? Template.asString([ `${RuntimeGlobals.require}.consumesLoadingData.initialConsumes = ${JSON.stringify(initialConsumes)};`, @@ -142,7 +136,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { Template.indent([ `initialConsumes: ${RuntimeGlobals.require}.consumesLoadingData.initialConsumes,`, 'installedModules:installedModules,', - `moduleToHandlerMapping:${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping,`, + `moduleToHandlerMapping,`, `webpackRequire: ${RuntimeGlobals.require}`, ]), `})`, @@ -165,7 +159,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule { `chunkMapping: ${RuntimeGlobals.require}.consumesLoadingData.chunkMapping,`, 'installedModules: installedModules,', 'chunkId: chunkId,', - `moduleToHandlerMapping: ${RuntimeGlobals.require}.consumesLoadingData.moduleIdToConsumeDataMapping,`, + `moduleToHandlerMapping,`, 'promises: promises,', `webpackRequire:${RuntimeGlobals.require}`, '});', diff --git a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts index 1549ea9d08d..6b05ab7ae89 100644 --- a/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts +++ b/packages/enhanced/test/unit/sharing/resolveMatchedConfigs.test.ts @@ -18,7 +18,7 @@ jest.mock( 'webpack/lib/ModuleNotFoundError', () => jest.fn().mockImplementation((module, err, details) => { - return { module, err, details }; + return { module, error: err, details }; }), { virtual: true, @@ -152,7 +152,7 @@ describe('resolveMatchedConfigs', () => { expect(mockCompilation.errors).toHaveLength(1); // Assert error message semantics without assuming exact error shape const recordedErr: any = mockCompilation.errors[0]; - const errMsg = String(recordedErr?.message || recordedErr); + const errMsg = String(recordedErr?.error?.message || recordedErr); expect(errMsg).toMatch(/(Module not found|Can't resolve)/); // Ensure the missing request is mentioned somewhere on the error expect(errMsg + JSON.stringify(recordedErr)).toContain( @@ -176,7 +176,7 @@ describe('resolveMatchedConfigs', () => { expect(result.resolved.size).toBe(0); expect(mockCompilation.errors).toHaveLength(1); const recordedErr2: any = mockCompilation.errors[0]; - const errMsg2 = String(recordedErr2?.message || recordedErr2); + const errMsg2 = String(recordedErr2?.error?.message || recordedErr2); expect(errMsg2).toMatch(/(Module not found|Can't resolve)/); expect(errMsg2 + JSON.stringify(recordedErr2)).toContain( './invalid-module', diff --git a/packages/webpack-bundler-runtime/src/types.ts b/packages/webpack-bundler-runtime/src/types.ts index 431e8668838..64e19b06bb6 100644 --- a/packages/webpack-bundler-runtime/src/types.ts +++ b/packages/webpack-bundler-runtime/src/types.ts @@ -73,11 +73,16 @@ export type RemoteDataItem = { }; export type ModuleIdToRemoteDataMapping = Record; +type ModuleIdToConsumeDataMapping = { + fallback: () => Promise; + shareKey: string; + shareScope: string | string[]; +} & SharedConfig; type WithStatus = T & { _updated: number }; // It will update while lazy compile export type ConsumesLoadingData = WithStatus<{ chunkMapping?: Record>; - moduleIdToConsumeDataMapping?: Record; + moduleIdToConsumeDataMapping?: Record; initialConsumes?: Array; }>; diff --git a/packages/webpack-bundler-runtime/src/updateOptions.ts b/packages/webpack-bundler-runtime/src/updateOptions.ts index 1936735e19c..2d0fa498a85 100644 --- a/packages/webpack-bundler-runtime/src/updateOptions.ts +++ b/packages/webpack-bundler-runtime/src/updateOptions.ts @@ -25,7 +25,22 @@ export function updateConsumeOptions( Object.entries(updatedModuleIdToConsumeDataMapping).forEach( ([id, data]) => { if (!moduleToHandlerMapping[id]) { - moduleToHandlerMapping[id] = data; + moduleToHandlerMapping[id] = { + getter: data.fallback, + shareInfo: { + shareConfig: { + requiredVersion: data.requiredVersion, + strictVersion: data.strictVersion, + singleton: data.singleton, + eager: data.eager, + layer: data.layer, + }, + scope: Array.isArray(data.shareScope) + ? data.shareScope + : [data.shareScope || 'default'], + }, + shareKey: data.shareKey, + }; } }, ); From eb6484a92012791028b9e05081d718c42c68998b Mon Sep 17 00:00:00 2001 From: ScriptedAlchemy Date: Fri, 3 Oct 2025 13:22:54 -0700 Subject: [PATCH 09/10] test(enhanced): update RemoteRuntimeModule scaffold to new remotes assignments --- .../enhanced/test/unit/container/RemoteRuntimeModule.test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts b/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts index 4cf4e718f9a..cb548197d3b 100644 --- a/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts +++ b/packages/enhanced/test/unit/container/RemoteRuntimeModule.test.ts @@ -169,7 +169,10 @@ describe('RemoteRuntimeModule', () => { 'var chunkMapping = {};', 'var idToExternalAndNameMapping = {};', 'var idToRemoteMap = {};', - '__FEDERATION__.bundlerRuntimeOptions.remotes = {idToRemoteMap,chunkMapping, idToExternalAndNameMapping, webpackRequire:__webpack_require__};', + '__FEDERATION__.bundlerRuntimeOptions.remotes.chunkMapping = chunkMapping;', + '__FEDERATION__.bundlerRuntimeOptions.remotes.idToExternalAndNameMapping = idToExternalAndNameMapping;', + '__FEDERATION__.bundlerRuntimeOptions.remotes.idToRemoteMap = idToRemoteMap;', + '__webpack_require__.remotesLoadingData.moduleIdToRemoteDataMapping = {};', '__webpack_require__.e.remotes = function(chunkId, promises) { __FEDERATION__.bundlerRuntime.remotes({idToRemoteMap,chunkMapping, idToExternalAndNameMapping, chunkId, promises, webpackRequire:__webpack_require__}); }', ].join('\n'); expect(normalized).toBe(expected); From a2304f528a5c6fd481790962b3f39717c13689e0 Mon Sep 17 00:00:00 2001 From: 2heal1 Date: Thu, 9 Oct 2025 19:03:07 +0800 Subject: [PATCH 10/10] chore: disable lazyCompilation until rspack release new version --- .changeset/thick-lies-speak.md | 5 ----- packages/rspress-plugin/src/plugin.ts | 9 +++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 .changeset/thick-lies-speak.md diff --git a/.changeset/thick-lies-speak.md b/.changeset/thick-lies-speak.md deleted file mode 100644 index 56f34beb31d..00000000000 --- a/.changeset/thick-lies-speak.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@module-federation/rspress-plugin': patch ---- - -feat(rspress-plugin): support lazy compilation diff --git a/packages/rspress-plugin/src/plugin.ts b/packages/rspress-plugin/src/plugin.ts index e9bf6ee791f..26b48264fdc 100644 --- a/packages/rspress-plugin/src/plugin.ts +++ b/packages/rspress-plugin/src/plugin.ts @@ -144,6 +144,15 @@ export function pluginModuleFederation( config.builderConfig ||= {}; config.builderConfig.dev ||= {}; + if ( + isDev() && + typeof config.builderConfig.dev.lazyCompilation === 'undefined' + ) { + logger.warn( + 'lazyCompilation is not fully supported for module federation, set lazyCompilation to false', + ); + config.builderConfig.dev.lazyCompilation = false; + } config.builderConfig.plugins ||= []; config.builderConfig.plugins.push( rsbuildPluginModuleFederation(mfConfig, {