Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/virtualModules/virtualRemotes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ export function getUsedRemotesMap() {
}
export function generateRemotes(id: string, command: string) {
return `
const {loadRemote} = require("@module-federation/runtime")
const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")
const res = initPromise.then(_ => loadRemote(${JSON.stringify(id)}))
const res = initPromise.then(runtime => runtime.loadRemote(${JSON.stringify(id)}))
const exportModule = ${command !== 'build' ? '/*mf top-level-await placeholder replacement mf*/' : 'await '}initPromise.then(_ => res)
module.exports = exportModule
`;
Expand Down
24 changes: 15 additions & 9 deletions src/virtualModules/virtualRuntimeInitStatus.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
import VirtualModule from '../utils/VirtualModule';
export const virtualRuntimeInitStatus = new VirtualModule('runtimeInit');
export function writeRuntimeInitStatus() {
// Use globalThis singleton to ensure only one initPromise exists
const globalKey = `__mf_init__${virtualRuntimeInitStatus.getImportId()}__`;
virtualRuntimeInitStatus.writeSync(`
let initResolve, initReject
const initPromise = new Promise((re, rj) => {
initResolve = re
initReject = rj
})
module.exports = {
initPromise,
initResolve,
initReject
const globalKey = ${JSON.stringify(globalKey)}
if (!globalThis[globalKey]) {
let initResolve, initReject
const initPromise = new Promise((re, rj) => {
initResolve = re
initReject = rj
})
globalThis[globalKey] = {
initPromise,
initResolve,
initReject
}
}
module.exports = globalThis[globalKey]
`);
}
15 changes: 7 additions & 8 deletions src/virtualModules/virtualShared_preBuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,17 @@ export function getLoadShareModulePath(pkg: string): string {
}
export function writeLoadShareModule(pkg: string, shareItem: ShareItem, command: string) {
loadShareCacheMap[pkg].writeSync(`
;() => import(${JSON.stringify(getPreBuildLibImportId(pkg))}).catch(() => {});
// dev uses dynamic import to separate chunks
${command !== 'build' ? `;() => import(${JSON.stringify(pkg)}).catch(() => {});` : ''}
const {loadShare} = require("@module-federation/runtime")
const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")
const res = initPromise.then(_ => loadShare(${JSON.stringify(pkg)}, {
customShareInfo: {shareConfig:{
singleton: ${shareItem.shareConfig.singleton},
strictVersion: ${shareItem.shareConfig.strictVersion},
requiredVersion: ${JSON.stringify(shareItem.shareConfig.requiredVersion)}
}}}))
const res = initPromise.then(runtime => runtime.loadShare(${JSON.stringify(pkg)}, {
customShareInfo: {shareConfig:{
singleton: ${shareItem.shareConfig.singleton},
strictVersion: ${shareItem.shareConfig.strictVersion},
requiredVersion: ${JSON.stringify(shareItem.shareConfig.requiredVersion)}
}}
}))
const exportModule = ${command !== 'build' ? '/*mf top-level-await placeholder replacement mf*/' : 'await '}res.then(factory => factory())
module.exports = exportModule
`);
Expand Down