@module-federation/modern-js 0.0.0-next-20250221063001 → 0.0.0-next-20250221081237
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/cjs/cli/configPlugin.js +18 -42
- package/dist/cjs/cli/index.js +24 -30
- package/dist/cjs/cli/ssrPlugin.js +30 -38
- package/dist/cjs/cli/utils.js +27 -62
- package/dist/cjs/cli/utils.spec.js +0 -60
- package/dist/esm/cli/configPlugin.js +18 -45
- package/dist/esm/cli/index.js +28 -35
- package/dist/esm/cli/ssrPlugin.js +30 -42
- package/dist/esm/cli/utils.js +27 -60
- package/dist/esm/cli/utils.spec.js +1 -78
- package/dist/esm-node/cli/configPlugin.js +18 -41
- package/dist/esm-node/cli/index.js +24 -30
- package/dist/esm-node/cli/ssrPlugin.js +29 -38
- package/dist/esm-node/cli/utils.js +27 -61
- package/dist/esm-node/cli/utils.spec.js +1 -61
- package/dist/types/cli/configPlugin.d.ts +1 -11
- package/dist/types/cli/ssrPlugin.d.ts +1 -0
- package/dist/types/cli/utils.d.ts +5 -6
- package/dist/types/types/index.d.ts +1 -1
- package/package.json +13 -13
package/dist/esm/cli/index.js
CHANGED
|
@@ -24,43 +24,36 @@ var moduleFederationPlugin = function() {
|
|
|
24
24
|
var modernjsConfig;
|
|
25
25
|
return _ts_generator(this, function(_state) {
|
|
26
26
|
modernjsConfig = api.getConfig();
|
|
27
|
-
api.
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
27
|
+
api.modifyBundlerChain(function(chain, param) {
|
|
28
|
+
var isServer = param.isServer;
|
|
29
|
+
var bundlerType = api.getAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
|
|
30
|
+
var browserPluginOptions = internalModernPluginOptions.csrConfig;
|
|
31
|
+
var MFPlugin = bundlerType === "webpack" ? WebpackModuleFederationPlugin : RspackModuleFederationPlugin;
|
|
32
|
+
if (!isServer) {
|
|
33
|
+
chain.plugin("plugin-module-federation").use(MFPlugin, [
|
|
34
|
+
browserPluginOptions
|
|
35
|
+
]).init(function(Plugin, args) {
|
|
36
|
+
internalModernPluginOptions.browserPlugin = new Plugin(args[0]);
|
|
37
|
+
return internalModernPluginOptions.browserPlugin;
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
if (bundlerType === "webpack") {
|
|
41
|
+
var _modernjsConfig_source;
|
|
42
|
+
var enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
|
|
43
|
+
if (!enableAsyncEntry && browserPluginOptions.async !== false) {
|
|
44
|
+
var asyncBoundaryPluginOptions = _type_of(browserPluginOptions.async) === "object" ? browserPluginOptions.async : {
|
|
45
|
+
eager: function(module) {
|
|
46
|
+
return module && /\.federation/.test((module === null || module === void 0 ? void 0 : module.request) || "");
|
|
47
|
+
},
|
|
48
|
+
excludeChunk: function(chunk) {
|
|
49
|
+
return chunk.name === browserPluginOptions.name;
|
|
37
50
|
}
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
var browserPluginOptions = internalModernPluginOptions.csrConfig;
|
|
43
|
-
if (!isServer) {
|
|
44
|
-
var _config_plugins;
|
|
45
|
-
internalModernPluginOptions.browserPlugin = new WebpackModuleFederationPlugin(browserPluginOptions);
|
|
46
|
-
(_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(internalModernPluginOptions.browserPlugin);
|
|
47
|
-
}
|
|
48
|
-
var enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
|
|
49
|
-
if (!enableAsyncEntry && browserPluginOptions.async !== false) {
|
|
50
|
-
var _config_plugins1;
|
|
51
|
-
var asyncBoundaryPluginOptions = _type_of(browserPluginOptions.async) === "object" ? browserPluginOptions.async : {
|
|
52
|
-
eager: function(module) {
|
|
53
|
-
return module && /\.federation/.test((module === null || module === void 0 ? void 0 : module.request) || "");
|
|
54
|
-
},
|
|
55
|
-
excludeChunk: function(chunk) {
|
|
56
|
-
return chunk.name === browserPluginOptions.name;
|
|
57
|
-
}
|
|
58
|
-
};
|
|
59
|
-
(_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(new AsyncBoundaryPlugin(asyncBoundaryPluginOptions));
|
|
60
|
-
}
|
|
61
|
-
}
|
|
51
|
+
};
|
|
52
|
+
chain.plugin("async-boundary-plugin").use(AsyncBoundaryPlugin, [
|
|
53
|
+
asyncBoundaryPluginOptions
|
|
54
|
+
]);
|
|
62
55
|
}
|
|
63
|
-
}
|
|
56
|
+
}
|
|
64
57
|
});
|
|
65
58
|
return [
|
|
66
59
|
2
|
|
@@ -12,6 +12,7 @@ function setEnv() {
|
|
|
12
12
|
process.env["MF_DISABLE_EMIT_STATS"] = "true";
|
|
13
13
|
process.env["MF_SSR_PRJ"] = "true";
|
|
14
14
|
}
|
|
15
|
+
var CHAIN_MF_PLUGIN_ID = "plugin-module-federation-server";
|
|
15
16
|
var moduleFederationSSRPlugin = function(pluginOptions) {
|
|
16
17
|
return {
|
|
17
18
|
name: "@modern-js/plugin-module-federation-ssr",
|
|
@@ -21,10 +22,10 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
|
|
|
21
22
|
],
|
|
22
23
|
setup: function() {
|
|
23
24
|
var _ref = _async_to_generator(function(api) {
|
|
24
|
-
var _pluginOptions_userConfig, _modernjsConfig_server, modernjsConfig, enableSSR;
|
|
25
|
+
var _pluginOptions_userConfig, _modernjsConfig_server, modernjsConfig, _pluginOptions_userConfig_ssr, enableSSR;
|
|
25
26
|
return _ts_generator(this, function(_state) {
|
|
26
27
|
modernjsConfig = api.getConfig();
|
|
27
|
-
enableSSR = ((_pluginOptions_userConfig = pluginOptions.userConfig) === null || _pluginOptions_userConfig === void 0 ? void 0 : _pluginOptions_userConfig.ssr)
|
|
28
|
+
enableSSR = (_pluginOptions_userConfig_ssr = (_pluginOptions_userConfig = pluginOptions.userConfig) === null || _pluginOptions_userConfig === void 0 ? void 0 : _pluginOptions_userConfig.ssr) !== null && _pluginOptions_userConfig_ssr !== void 0 ? _pluginOptions_userConfig_ssr : Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
|
|
28
29
|
if (!enableSSR) {
|
|
29
30
|
return [
|
|
30
31
|
2
|
|
@@ -49,35 +50,35 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
|
|
|
49
50
|
plugins
|
|
50
51
|
};
|
|
51
52
|
});
|
|
53
|
+
api.modifyBundlerChain(function(chain, param) {
|
|
54
|
+
var isServer = param.isServer;
|
|
55
|
+
var bundlerType = api.getAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
|
|
56
|
+
var MFPlugin = bundlerType === "webpack" ? ModuleFederationPlugin : RspackModuleFederationPlugin;
|
|
57
|
+
if (isServer) {
|
|
58
|
+
if (!chain.plugins.has(CHAIN_MF_PLUGIN_ID)) {
|
|
59
|
+
chain.plugin(CHAIN_MF_PLUGIN_ID).use(MFPlugin, [
|
|
60
|
+
pluginOptions.ssrConfig
|
|
61
|
+
]).init(function(Plugin, args) {
|
|
62
|
+
pluginOptions.nodePlugin = new Plugin(args[0]);
|
|
63
|
+
return pluginOptions.nodePlugin;
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
if (isServer) {
|
|
68
|
+
chain.target("async-node");
|
|
69
|
+
if (isDev) {
|
|
70
|
+
chain.plugin("UniverseEntryChunkTrackerPlugin").use(UniverseEntryChunkTrackerPlugin);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
if (isDev && !isServer) {
|
|
74
|
+
chain.externals({
|
|
75
|
+
"@module-federation/node/utils": "NOT_USED_IN_BROWSER"
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
});
|
|
52
79
|
api.config(function() {
|
|
53
80
|
return {
|
|
54
81
|
tools: {
|
|
55
|
-
rspack: function rspack(config, param) {
|
|
56
|
-
var isServer = param.isServer;
|
|
57
|
-
if (isServer) {
|
|
58
|
-
if (!pluginOptions.nodePlugin) {
|
|
59
|
-
var _config_plugins;
|
|
60
|
-
pluginOptions.nodePlugin = new RspackModuleFederationPlugin(pluginOptions.ssrConfig);
|
|
61
|
-
(_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(pluginOptions.nodePlugin);
|
|
62
|
-
}
|
|
63
|
-
} else {
|
|
64
|
-
var _config_output;
|
|
65
|
-
pluginOptions.distOutputDir = pluginOptions.distOutputDir || ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
|
|
66
|
-
}
|
|
67
|
-
},
|
|
68
|
-
webpack: function webpack(config, param) {
|
|
69
|
-
var isServer = param.isServer;
|
|
70
|
-
if (isServer) {
|
|
71
|
-
if (!pluginOptions.nodePlugin) {
|
|
72
|
-
var _config_plugins;
|
|
73
|
-
pluginOptions.nodePlugin = new ModuleFederationPlugin(pluginOptions.ssrConfig);
|
|
74
|
-
(_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(pluginOptions.nodePlugin);
|
|
75
|
-
}
|
|
76
|
-
} else {
|
|
77
|
-
var _config_output;
|
|
78
|
-
pluginOptions.distOutputDir = pluginOptions.distOutputDir || ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
|
|
79
|
-
}
|
|
80
|
-
},
|
|
81
82
|
devServer: {
|
|
82
83
|
before: [
|
|
83
84
|
function(req, res, next) {
|
|
@@ -103,20 +104,6 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
|
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
106
|
]
|
|
106
|
-
},
|
|
107
|
-
bundlerChain: function bundlerChain(chain, param) {
|
|
108
|
-
var isServer = param.isServer;
|
|
109
|
-
if (isServer) {
|
|
110
|
-
chain.target("async-node");
|
|
111
|
-
if (isDev) {
|
|
112
|
-
chain.plugin("UniverseEntryChunkTrackerPlugin").use(UniverseEntryChunkTrackerPlugin);
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
if (isDev && !isServer) {
|
|
116
|
-
chain.externals({
|
|
117
|
-
"@module-federation/node/utils": "NOT_USED_IN_BROWSER"
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
107
|
}
|
|
121
108
|
}
|
|
122
109
|
};
|
|
@@ -142,6 +129,7 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
|
|
|
142
129
|
};
|
|
143
130
|
var ssrPlugin_default = moduleFederationSSRPlugin;
|
|
144
131
|
export {
|
|
132
|
+
CHAIN_MF_PLUGIN_ID,
|
|
145
133
|
ssrPlugin_default as default,
|
|
146
134
|
moduleFederationSSRPlugin,
|
|
147
135
|
setEnv
|
package/dist/esm/cli/utils.js
CHANGED
|
@@ -166,14 +166,14 @@ var patchMFConfig = function(mfConfig, isServer, remoteIpStrategy) {
|
|
|
166
166
|
mfConfig.dev = false;
|
|
167
167
|
return mfConfig;
|
|
168
168
|
};
|
|
169
|
-
function patchIgnoreWarning(
|
|
170
|
-
|
|
169
|
+
function patchIgnoreWarning(chain) {
|
|
170
|
+
var ignoreWarnings = chain.get("ignoreWarnings") || [];
|
|
171
171
|
var ignoredMsgs = [
|
|
172
172
|
"external script",
|
|
173
173
|
"process.env.WS_NO_BUFFER_UTIL",
|
|
174
174
|
"Can't resolve 'utf-8-validate"
|
|
175
175
|
];
|
|
176
|
-
|
|
176
|
+
ignoreWarnings.push(function(warning) {
|
|
177
177
|
if (ignoredMsgs.some(function(msg) {
|
|
178
178
|
return warning.message.includes(msg);
|
|
179
179
|
})) {
|
|
@@ -181,6 +181,7 @@ function patchIgnoreWarning(bundlerConfig) {
|
|
|
181
181
|
}
|
|
182
182
|
return false;
|
|
183
183
|
});
|
|
184
|
+
chain.ignoreWarnings(ignoreWarnings);
|
|
184
185
|
}
|
|
185
186
|
function addMyTypes2Ignored(chain, mfConfig) {
|
|
186
187
|
var watchOptions = chain.get("watchOptions");
|
|
@@ -215,54 +216,43 @@ function addMyTypes2Ignored(chain, mfConfig) {
|
|
|
215
216
|
}));
|
|
216
217
|
}
|
|
217
218
|
function patchBundlerConfig(options) {
|
|
218
|
-
var
|
|
219
|
-
var
|
|
220
|
-
|
|
221
|
-
(
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
var _bundlerConfig_output1, _bundlerConfig_output2;
|
|
225
|
-
if (!((_bundlerConfig_output1 = bundlerConfig.output) === null || _bundlerConfig_output1 === void 0 ? void 0 : _bundlerConfig_output1.chunkLoadingGlobal)) {
|
|
226
|
-
bundlerConfig.output.chunkLoadingGlobal = "chunk_".concat(mfConfig.name);
|
|
227
|
-
}
|
|
228
|
-
if (!((_bundlerConfig_output2 = bundlerConfig.output) === null || _bundlerConfig_output2 === void 0 ? void 0 : _bundlerConfig_output2.uniqueName)) {
|
|
229
|
-
bundlerConfig.output.uniqueName = mfConfig.name;
|
|
230
|
-
}
|
|
219
|
+
var _modernjsConfig_deploy;
|
|
220
|
+
var chain = options.chain, modernjsConfig = options.modernjsConfig, isServer = options.isServer, mfConfig = options.mfConfig, enableSSR = options.enableSSR;
|
|
221
|
+
chain.optimization.delete("runtimeChunk");
|
|
222
|
+
patchIgnoreWarning(chain);
|
|
223
|
+
if (!chain.output.get("chunkLoadingGlobal")) {
|
|
224
|
+
chain.output.chunkLoadingGlobal("chunk_".concat(mfConfig.name));
|
|
231
225
|
}
|
|
226
|
+
if (!chain.output.get("uniqueName")) {
|
|
227
|
+
chain.output.uniqueName(mfConfig.name);
|
|
228
|
+
}
|
|
229
|
+
var splitChunkConfig = chain.optimization.splitChunks.entries();
|
|
232
230
|
if (!isServer) {
|
|
233
|
-
autoDeleteSplitChunkCacheGroups(mfConfig,
|
|
231
|
+
autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
|
|
234
232
|
}
|
|
235
|
-
if (!isServer && enableSSR &&
|
|
236
|
-
|
|
233
|
+
if (!isServer && enableSSR && splitChunkConfig && (typeof splitChunkConfig === "undefined" ? "undefined" : _type_of(splitChunkConfig)) === "object" && splitChunkConfig.cacheGroups) {
|
|
234
|
+
splitChunkConfig.chunks = "async";
|
|
237
235
|
logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
|
|
238
236
|
}
|
|
239
|
-
if (isDev &&
|
|
240
|
-
var _modernjsConfig_dev,
|
|
241
|
-
var port = ((_modernjsConfig_dev = modernjsConfig.dev) === null || _modernjsConfig_dev === void 0 ? void 0 : _modernjsConfig_dev.port) || ((
|
|
237
|
+
if (isDev && chain.output.get("publicPath") === "auto") {
|
|
238
|
+
var _modernjsConfig_dev, _modernjsConfig_server;
|
|
239
|
+
var port = ((_modernjsConfig_dev = modernjsConfig.dev) === null || _modernjsConfig_dev === void 0 ? void 0 : _modernjsConfig_dev.port) || ((_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.port) || 8080;
|
|
242
240
|
var publicPath = "http://localhost:".concat(port, "/");
|
|
243
|
-
|
|
241
|
+
chain.output.publicPath(publicPath);
|
|
244
242
|
}
|
|
245
243
|
if (isServer && enableSSR) {
|
|
246
|
-
var
|
|
247
|
-
var
|
|
248
|
-
|
|
249
|
-
if (output && typeof chunkFileName === "string" && uniqueName && !chunkFileName.includes(uniqueName)) {
|
|
244
|
+
var uniqueName = mfConfig.name || chain.output.get("uniqueName");
|
|
245
|
+
var chunkFileName = chain.output.get("chunkFilename");
|
|
246
|
+
if (typeof chunkFileName === "string" && uniqueName && !chunkFileName.includes(uniqueName)) {
|
|
250
247
|
var suffix = "".concat(encodeName(uniqueName), "-[chunkhash].js");
|
|
251
|
-
output.chunkFilename
|
|
248
|
+
chain.output.chunkFilename(chunkFileName.replace(".js", suffix));
|
|
252
249
|
}
|
|
253
250
|
}
|
|
254
251
|
if (isDev && enableSSR && !isServer) {
|
|
255
|
-
|
|
256
|
-
crypto: false,
|
|
257
|
-
stream: false,
|
|
258
|
-
vm: false
|
|
259
|
-
});
|
|
252
|
+
chain.resolve.fallback.set("crypto", false).set("stream", false).set("vm", false);
|
|
260
253
|
}
|
|
261
254
|
if (((_modernjsConfig_deploy = modernjsConfig.deploy) === null || _modernjsConfig_deploy === void 0 ? void 0 : _modernjsConfig_deploy.microFrontend) && Object.keys(mfConfig.exposes || {}).length) {
|
|
262
|
-
|
|
263
|
-
bundlerConfig.optimization = {};
|
|
264
|
-
}
|
|
265
|
-
bundlerConfig.optimization.usedExports = false;
|
|
255
|
+
chain.optimization.usedExports(false);
|
|
266
256
|
}
|
|
267
257
|
}
|
|
268
258
|
var localIpv4 = "127.0.0.1";
|
|
@@ -290,33 +280,10 @@ var getIPV4 = function() {
|
|
|
290
280
|
};
|
|
291
281
|
return ipv4Interface.address;
|
|
292
282
|
};
|
|
293
|
-
var SPLIT_CHUNK_MAP = {
|
|
294
|
-
REACT: "react",
|
|
295
|
-
ROUTER: "router",
|
|
296
|
-
LODASH: "lib-lodash",
|
|
297
|
-
ANTD: "lib-antd",
|
|
298
|
-
ARCO: "lib-arco",
|
|
299
|
-
SEMI: "lib-semi",
|
|
300
|
-
AXIOS: "lib-axios"
|
|
301
|
-
};
|
|
302
|
-
var SHARED_SPLIT_CHUNK_MAP = {
|
|
303
|
-
react: SPLIT_CHUNK_MAP.REACT,
|
|
304
|
-
"react-dom": SPLIT_CHUNK_MAP.REACT,
|
|
305
|
-
"react-router": SPLIT_CHUNK_MAP.ROUTER,
|
|
306
|
-
"react-router-dom": SPLIT_CHUNK_MAP.ROUTER,
|
|
307
|
-
"@remix-run/router": SPLIT_CHUNK_MAP.ROUTER,
|
|
308
|
-
lodash: SPLIT_CHUNK_MAP.LODASH,
|
|
309
|
-
"lodash-es": SPLIT_CHUNK_MAP.LODASH,
|
|
310
|
-
antd: SPLIT_CHUNK_MAP.ANTD,
|
|
311
|
-
"@arco-design/web-react": SPLIT_CHUNK_MAP.ARCO,
|
|
312
|
-
"@douyinfe/semi-ui": SPLIT_CHUNK_MAP.SEMI,
|
|
313
|
-
axios: SPLIT_CHUNK_MAP.AXIOS
|
|
314
|
-
};
|
|
315
283
|
export {
|
|
316
284
|
addMyTypes2Ignored,
|
|
317
285
|
getIPV4,
|
|
318
286
|
getMFConfig,
|
|
319
287
|
patchBundlerConfig,
|
|
320
|
-
patchIgnoreWarning,
|
|
321
288
|
patchMFConfig
|
|
322
289
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
2
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
3
|
import { it, expect, describe } from "vitest";
|
|
4
|
-
import { patchMFConfig,
|
|
4
|
+
import { patchMFConfig, getIPV4 } from "./utils";
|
|
5
5
|
var mfConfig = {
|
|
6
6
|
name: "host",
|
|
7
7
|
filename: "remoteEntry.js",
|
|
@@ -105,80 +105,3 @@ describe("patchMFConfig", /* @__PURE__ */ _async_to_generator(function() {
|
|
|
105
105
|
];
|
|
106
106
|
});
|
|
107
107
|
}));
|
|
108
|
-
describe("patchBundlerConfig", /* @__PURE__ */ _async_to_generator(function() {
|
|
109
|
-
return _ts_generator(this, function(_state) {
|
|
110
|
-
it("patchBundlerConfig: server", /* @__PURE__ */ _async_to_generator(function() {
|
|
111
|
-
var bundlerConfig, expectedConfig;
|
|
112
|
-
return _ts_generator(this, function(_state2) {
|
|
113
|
-
bundlerConfig = {
|
|
114
|
-
output: {
|
|
115
|
-
publicPath: "auto"
|
|
116
|
-
}
|
|
117
|
-
};
|
|
118
|
-
patchBundlerConfig({
|
|
119
|
-
bundlerType: "webpack",
|
|
120
|
-
bundlerConfig,
|
|
121
|
-
isServer: true,
|
|
122
|
-
modernjsConfig: {
|
|
123
|
-
server: {
|
|
124
|
-
ssr: {
|
|
125
|
-
mode: "stream"
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
},
|
|
129
|
-
mfConfig
|
|
130
|
-
});
|
|
131
|
-
expectedConfig = {
|
|
132
|
-
output: {
|
|
133
|
-
chunkLoadingGlobal: "chunk_host",
|
|
134
|
-
publicPath: "auto",
|
|
135
|
-
uniqueName: "host"
|
|
136
|
-
}
|
|
137
|
-
};
|
|
138
|
-
bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;
|
|
139
|
-
expect(bundlerConfig).toStrictEqual(expectedConfig);
|
|
140
|
-
return [
|
|
141
|
-
2
|
|
142
|
-
];
|
|
143
|
-
});
|
|
144
|
-
}));
|
|
145
|
-
it("patchBundlerConfig: client", /* @__PURE__ */ _async_to_generator(function() {
|
|
146
|
-
var bundlerConfig, expectedConfig;
|
|
147
|
-
return _ts_generator(this, function(_state2) {
|
|
148
|
-
bundlerConfig = {
|
|
149
|
-
output: {
|
|
150
|
-
publicPath: "auto"
|
|
151
|
-
}
|
|
152
|
-
};
|
|
153
|
-
patchBundlerConfig({
|
|
154
|
-
bundlerType: "webpack",
|
|
155
|
-
bundlerConfig,
|
|
156
|
-
isServer: false,
|
|
157
|
-
modernjsConfig: {
|
|
158
|
-
server: {
|
|
159
|
-
ssr: {
|
|
160
|
-
mode: "stream"
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
},
|
|
164
|
-
mfConfig
|
|
165
|
-
});
|
|
166
|
-
expectedConfig = {
|
|
167
|
-
output: {
|
|
168
|
-
chunkLoadingGlobal: "chunk_host",
|
|
169
|
-
publicPath: "auto",
|
|
170
|
-
uniqueName: "host"
|
|
171
|
-
}
|
|
172
|
-
};
|
|
173
|
-
bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;
|
|
174
|
-
expect(bundlerConfig).toStrictEqual(expectedConfig);
|
|
175
|
-
return [
|
|
176
|
-
2
|
|
177
|
-
];
|
|
178
|
-
});
|
|
179
|
-
}));
|
|
180
|
-
return [
|
|
181
|
-
2
|
|
182
|
-
];
|
|
183
|
-
});
|
|
184
|
-
}));
|
|
@@ -6,17 +6,6 @@ function setEnv(enableSSR) {
|
|
|
6
6
|
process.env["MF_SSR_PRJ"] = "true";
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
|
-
function modifyBundlerConfig(options) {
|
|
10
|
-
const { mfConfig, config, isServer, modernjsConfig, remoteIpStrategy = "ipv4", bundlerType } = options;
|
|
11
|
-
patchMFConfig(mfConfig, isServer, remoteIpStrategy);
|
|
12
|
-
patchBundlerConfig({
|
|
13
|
-
bundlerType,
|
|
14
|
-
bundlerConfig: config,
|
|
15
|
-
isServer,
|
|
16
|
-
modernjsConfig,
|
|
17
|
-
mfConfig
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
9
|
const moduleFederationConfigPlugin = (userConfig) => ({
|
|
21
10
|
name: "@modern-js/plugin-module-federation-config",
|
|
22
11
|
pre: [
|
|
@@ -26,17 +15,33 @@ const moduleFederationConfigPlugin = (userConfig) => ({
|
|
|
26
15
|
"@modern-js/plugin-module-federation"
|
|
27
16
|
],
|
|
28
17
|
setup: async (api) => {
|
|
18
|
+
var _userConfig_userConfig, _modernjsConfig_server;
|
|
29
19
|
const modernjsConfig = api.getConfig();
|
|
30
20
|
const mfConfig = await getMFConfig(userConfig.originPluginOptions);
|
|
31
21
|
const csrConfig = userConfig.csrConfig || JSON.parse(JSON.stringify(mfConfig));
|
|
32
22
|
const ssrConfig = userConfig.ssrConfig || JSON.parse(JSON.stringify(mfConfig));
|
|
33
23
|
userConfig.ssrConfig = ssrConfig;
|
|
34
24
|
userConfig.csrConfig = csrConfig;
|
|
25
|
+
var _userConfig_userConfig_ssr;
|
|
26
|
+
const enableSSR = (_userConfig_userConfig_ssr = (_userConfig_userConfig = userConfig.userConfig) === null || _userConfig_userConfig === void 0 ? void 0 : _userConfig_userConfig.ssr) !== null && _userConfig_userConfig_ssr !== void 0 ? _userConfig_userConfig_ssr : Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
|
|
27
|
+
api.modifyBundlerChain((chain, { isProd, isServer }) => {
|
|
28
|
+
addMyTypes2Ignored(chain, isServer ? ssrConfig : csrConfig);
|
|
29
|
+
const targetMFConfig = isServer ? ssrConfig : csrConfig;
|
|
30
|
+
patchMFConfig(targetMFConfig, isServer, userConfig.remoteIpStrategy || "ipv4");
|
|
31
|
+
patchBundlerConfig({
|
|
32
|
+
// @ts-expect-error chain type is not correct
|
|
33
|
+
chain,
|
|
34
|
+
isServer,
|
|
35
|
+
modernjsConfig,
|
|
36
|
+
mfConfig,
|
|
37
|
+
enableSSR
|
|
38
|
+
});
|
|
39
|
+
userConfig.distOutputDir = chain.output.get("path") || path.resolve(process.cwd(), "dist");
|
|
40
|
+
});
|
|
35
41
|
api.config(() => {
|
|
36
|
-
var
|
|
42
|
+
var _modernjsConfig_source, _modernjsConfig_source1, _modernjsConfig_dev;
|
|
37
43
|
const bundlerType = api.getAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
|
|
38
44
|
const ipv4 = getIPV4();
|
|
39
|
-
const enableSSR = ((_userConfig_userConfig = userConfig.userConfig) === null || _userConfig_userConfig === void 0 ? void 0 : _userConfig_userConfig.ssr) === false ? false : Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
|
|
40
45
|
if (userConfig.remoteIpStrategy === void 0) {
|
|
41
46
|
if (!enableSSR) {
|
|
42
47
|
userConfig.remoteIpStrategy = "inherit";
|
|
@@ -47,33 +52,6 @@ const moduleFederationConfigPlugin = (userConfig) => ({
|
|
|
47
52
|
var _modernjsConfig_source_enableAsyncEntry;
|
|
48
53
|
return {
|
|
49
54
|
tools: {
|
|
50
|
-
bundlerChain(chain, { isServer }) {
|
|
51
|
-
addMyTypes2Ignored(chain, isServer ? ssrConfig : csrConfig);
|
|
52
|
-
},
|
|
53
|
-
rspack(config, { isServer }) {
|
|
54
|
-
var _config_output;
|
|
55
|
-
modifyBundlerConfig({
|
|
56
|
-
bundlerType,
|
|
57
|
-
mfConfig: isServer ? ssrConfig : csrConfig,
|
|
58
|
-
config,
|
|
59
|
-
isServer,
|
|
60
|
-
modernjsConfig,
|
|
61
|
-
remoteIpStrategy: userConfig.remoteIpStrategy
|
|
62
|
-
});
|
|
63
|
-
userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
|
|
64
|
-
},
|
|
65
|
-
webpack(config, { isServer }) {
|
|
66
|
-
var _config_output;
|
|
67
|
-
modifyBundlerConfig({
|
|
68
|
-
bundlerType,
|
|
69
|
-
mfConfig: isServer ? ssrConfig : csrConfig,
|
|
70
|
-
config,
|
|
71
|
-
isServer,
|
|
72
|
-
modernjsConfig,
|
|
73
|
-
remoteIpStrategy: userConfig.remoteIpStrategy
|
|
74
|
-
});
|
|
75
|
-
userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
|
|
76
|
-
},
|
|
77
55
|
devServer: {
|
|
78
56
|
headers: {
|
|
79
57
|
"Access-Control-Allow-Origin": "*",
|
|
@@ -102,7 +80,6 @@ const moduleFederationConfigPlugin = (userConfig) => ({
|
|
|
102
80
|
var configPlugin_default = moduleFederationConfigPlugin;
|
|
103
81
|
export {
|
|
104
82
|
configPlugin_default as default,
|
|
105
|
-
modifyBundlerConfig,
|
|
106
83
|
moduleFederationConfigPlugin,
|
|
107
84
|
setEnv
|
|
108
85
|
};
|
|
@@ -17,37 +17,31 @@ const moduleFederationPlugin = (userConfig = {}) => {
|
|
|
17
17
|
name: "@modern-js/plugin-module-federation",
|
|
18
18
|
setup: async (api) => {
|
|
19
19
|
const modernjsConfig = api.getConfig();
|
|
20
|
-
api.
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
eager: (module) => module && /\.federation/.test((module === null || module === void 0 ? void 0 : module.request) || ""),
|
|
44
|
-
excludeChunk: (chunk) => chunk.name === browserPluginOptions.name
|
|
45
|
-
};
|
|
46
|
-
(_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(new AsyncBoundaryPlugin(asyncBoundaryPluginOptions));
|
|
47
|
-
}
|
|
48
|
-
}
|
|
20
|
+
api.modifyBundlerChain((chain, { isServer }) => {
|
|
21
|
+
const bundlerType = api.getAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
|
|
22
|
+
const browserPluginOptions = internalModernPluginOptions.csrConfig;
|
|
23
|
+
const MFPlugin = bundlerType === "webpack" ? WebpackModuleFederationPlugin : RspackModuleFederationPlugin;
|
|
24
|
+
if (!isServer) {
|
|
25
|
+
chain.plugin("plugin-module-federation").use(MFPlugin, [
|
|
26
|
+
browserPluginOptions
|
|
27
|
+
]).init((Plugin, args) => {
|
|
28
|
+
internalModernPluginOptions.browserPlugin = new Plugin(args[0]);
|
|
29
|
+
return internalModernPluginOptions.browserPlugin;
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
if (bundlerType === "webpack") {
|
|
33
|
+
var _modernjsConfig_source;
|
|
34
|
+
const enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
|
|
35
|
+
if (!enableAsyncEntry && browserPluginOptions.async !== false) {
|
|
36
|
+
const asyncBoundaryPluginOptions = typeof browserPluginOptions.async === "object" ? browserPluginOptions.async : {
|
|
37
|
+
eager: (module) => module && /\.federation/.test((module === null || module === void 0 ? void 0 : module.request) || ""),
|
|
38
|
+
excludeChunk: (chunk) => chunk.name === browserPluginOptions.name
|
|
39
|
+
};
|
|
40
|
+
chain.plugin("async-boundary-plugin").use(AsyncBoundaryPlugin, [
|
|
41
|
+
asyncBoundaryPluginOptions
|
|
42
|
+
]);
|
|
49
43
|
}
|
|
50
|
-
}
|
|
44
|
+
}
|
|
51
45
|
});
|
|
52
46
|
},
|
|
53
47
|
usePlugins: [
|