@module-federation/enhanced 0.0.9 → 0.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +1 -1
- package/dist/src/lib/container/AsyncBoundaryPlugin.d.ts +2 -1
- package/dist/src/lib/container/AsyncBoundaryPlugin.js +15 -5
- package/dist/src/lib/container/AsyncBoundaryPlugin.js.map +1 -1
- package/dist/src/lib/container/runtime/FederationRuntimePlugin.js +4 -3
- package/dist/src/lib/container/runtime/FederationRuntimePlugin.js.map +1 -1
- package/package.json +4 -4
package/dist/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Compiler, Chunk, Module } from 'webpack';
|
|
1
|
+
import type { Compiler, Compilation, Chunk, Module } from 'webpack';
|
|
2
2
|
export interface Options {
|
|
3
3
|
eager?: RegExp | ((module: Module) => boolean);
|
|
4
4
|
excludeChunk?: (chunk: Chunk) => boolean;
|
|
@@ -9,6 +9,7 @@ declare class AsyncEntryStartupPlugin {
|
|
|
9
9
|
constructor(options?: Options);
|
|
10
10
|
apply(compiler: Compiler): void;
|
|
11
11
|
private _collectRuntimeChunks;
|
|
12
|
+
getChunkByName(compilation: Compilation, dependOn: string[]): (string | number | undefined)[];
|
|
12
13
|
private _handleRenderStartup;
|
|
13
14
|
private _getChunkRuntime;
|
|
14
15
|
private _getRemotes;
|
|
@@ -27,6 +27,16 @@ class AsyncEntryStartupPlugin {
|
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
|
+
getChunkByName(compilation, dependOn) {
|
|
31
|
+
const byname = [];
|
|
32
|
+
for (const name of dependOn) {
|
|
33
|
+
const chunk = compilation.namedChunks.get(name);
|
|
34
|
+
if (chunk) {
|
|
35
|
+
byname.push(chunk.id || chunk.name);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return byname;
|
|
39
|
+
}
|
|
30
40
|
_handleRenderStartup(compiler, compilation) {
|
|
31
41
|
compiler.webpack.javascript.JavascriptModulesPlugin.getCompilationHooks(compilation).renderStartup.tap('AsyncEntryStartupPlugin', (source, _renderContext, upperContext) => {
|
|
32
42
|
const isSingleRuntime = compiler.options?.optimization?.runtimeChunk;
|
|
@@ -52,9 +62,9 @@ class AsyncEntryStartupPlugin {
|
|
|
52
62
|
const consumeShares = compilation.chunkGraph.getChunkModulesIterableBySourceType(upperContext.chunk, 'consume-shared');
|
|
53
63
|
const entryOptions = upperContext.chunk.getEntryOptions();
|
|
54
64
|
const initialChunks = Array.from(upperContext.chunk.getAllInitialChunks()).map((chunk) => chunk.id);
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
65
|
+
const dependOn = entryOptions?.dependOn || [];
|
|
66
|
+
const dependOnIDs = this.getChunkByName(compilation, dependOn);
|
|
67
|
+
const chunksToRef = [...dependOnIDs, ...initialChunks];
|
|
58
68
|
remotes = this._getRemotes(compiler.webpack.RuntimeGlobals, requirements, Boolean(hasRemoteModules), chunksToRef, remotes);
|
|
59
69
|
shared = this._getShared(compiler.webpack.RuntimeGlobals, requirements, Boolean(consumeShares), chunksToRef, shared);
|
|
60
70
|
}
|
|
@@ -96,7 +106,7 @@ class AsyncEntryStartupPlugin {
|
|
|
96
106
|
'if(__webpack_require__.f && __webpack_require__.f.remotes) {',
|
|
97
107
|
];
|
|
98
108
|
for (const chunkId of chunksToRef) {
|
|
99
|
-
if (chunkId !== null) {
|
|
109
|
+
if (chunkId !== null && chunkId !== undefined) {
|
|
100
110
|
remotesParts.push(` __webpack_require__.f.remotes(${JSON.stringify(chunkId)}, promiseTrack);`);
|
|
101
111
|
}
|
|
102
112
|
}
|
|
@@ -116,7 +126,7 @@ class AsyncEntryStartupPlugin {
|
|
|
116
126
|
'if(__webpack_require__.f && __webpack_require__.f.consumes) {',
|
|
117
127
|
];
|
|
118
128
|
for (const chunkId of chunksToRef) {
|
|
119
|
-
if (chunkId !== null) {
|
|
129
|
+
if (chunkId !== null && chunkId !== undefined) {
|
|
120
130
|
sharedParts.push(` __webpack_require__.f.consumes(${JSON.stringify(chunkId)}, promiseTrack);`);
|
|
121
131
|
}
|
|
122
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AsyncBoundaryPlugin.js","sourceRoot":"","sources":["../../../../src/lib/container/AsyncBoundaryPlugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AsyncBoundaryPlugin.js","sourceRoot":"","sources":["../../../../src/lib/container/AsyncBoundaryPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,20 +27,21 @@ class FederationRuntimePlugin {
|
|
|
27
27
|
}
|
|
28
28
|
static getTemplate(runtimePlugins, bundlerRuntimePath) {
|
|
29
29
|
// internal runtime plugin
|
|
30
|
+
const normalizedBundlerRuntimePath = (bundlerRuntimePath || BundlerRuntimePath).replaceAll('\\', '/');
|
|
30
31
|
let runtimePluginTemplates = '';
|
|
31
32
|
const runtimePLuginNames = [];
|
|
32
33
|
if (Array.isArray(runtimePlugins)) {
|
|
33
34
|
runtimePlugins.forEach((runtimePlugin, index) => {
|
|
34
35
|
const runtimePluginName = `plugin_${index}`;
|
|
35
|
-
const runtimePluginPath = path_1.default.isAbsolute(runtimePlugin)
|
|
36
|
+
const runtimePluginPath = (path_1.default.isAbsolute(runtimePlugin)
|
|
36
37
|
? runtimePlugin
|
|
37
|
-
: path_1.default.join(process.cwd(), runtimePlugin);
|
|
38
|
+
: path_1.default.join(process.cwd(), runtimePlugin)).replaceAll('\\', '/');
|
|
38
39
|
runtimePluginTemplates += `import ${runtimePluginName} from '${runtimePluginPath}';\n`;
|
|
39
40
|
runtimePLuginNames.push(runtimePluginName);
|
|
40
41
|
});
|
|
41
42
|
}
|
|
42
43
|
return Template.asString([
|
|
43
|
-
`import federation from '${
|
|
44
|
+
`import federation from '${normalizedBundlerRuntimePath}';`,
|
|
44
45
|
runtimePluginTemplates,
|
|
45
46
|
`${federationGlobal} = {...federation,...${federationGlobal}};`,
|
|
46
47
|
`if(!${federationGlobal}.instance){`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationRuntimePlugin.js","sourceRoot":"","sources":["../../../../../src/lib/container/runtime/FederationRuntimePlugin.ts"],"names":[],"mappings":";;;;;AACA,0FAAqF;AACrF,wFAAgE;AAChE,mCAKiB;AACjB,4CAAoB;AACpB,gDAAwB;AACxB,0CAAuC;AAGvC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,OAAO,CAC1C,IAAA,6CAAoB,EAAC,SAAS,CAAC,CACJ,CAAC;AAC9B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAC5B,IAAA,6CAAoB,EAAC,qBAAqB,CAAC,CACJ,CAAC;AAE1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;AAE7E,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CACxC,4CAA4C,EAC5C;IACE,KAAK,EAAE,CAAC,gBAAgB,CAAC;CAC1B,CACF,CAAC;AACF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,4BAA4B,EAAE;IAChE,KAAK,EAAE,CAAC,gBAAgB,CAAC;CAC1B,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,cAAc,CAAC,CAAC;AAElE,MAAM,uBAAuB;IAK3B,YAAY,OAAuC;QACjD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,cAAwB,EAAE,kBAA2B;QACtE,0BAA0B;QAC1B,IAAI,sBAAsB,GAAG,EAAE,CAAC;QAChC,MAAM,kBAAkB,GAAa,EAAE,CAAC;QAExC,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;gBAC9C,MAAM,iBAAiB,GAAG,UAAU,KAAK,EAAE,CAAC;gBAC5C,MAAM,iBAAiB,GAAG,cAAI,CAAC,UAAU,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"FederationRuntimePlugin.js","sourceRoot":"","sources":["../../../../../src/lib/container/runtime/FederationRuntimePlugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/enhanced",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.11",
|
|
4
4
|
"main": "./dist/src/index.js",
|
|
5
5
|
"types": "./dist/src/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
-
"@module-federation/webpack-bundler-runtime": "0.0.
|
|
31
|
+
"@module-federation/webpack-bundler-runtime": "0.0.11"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@module-federation/sdk": "0.0.
|
|
35
|
-
"@module-federation/runtime-tools": "0.0.
|
|
34
|
+
"@module-federation/sdk": "0.0.11",
|
|
35
|
+
"@module-federation/runtime-tools": "0.0.11"
|
|
36
36
|
}
|
|
37
37
|
}
|