@module-federation/modern-js 0.0.0-next-20250402032411 → 0.0.0-next-20250403063747
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/manifest.js +9 -9
- package/dist/cjs/cli/ssrPlugin.js +3 -5
- package/dist/esm/cli/manifest.js +9 -9
- package/dist/esm/cli/ssrPlugin.js +3 -5
- package/dist/esm-node/cli/manifest.js +9 -9
- package/dist/esm-node/cli/ssrPlugin.js +3 -5
- package/dist/types/cli/manifest.d.ts +1 -1
- package/package.json +7 -7
package/dist/cjs/cli/manifest.js
CHANGED
|
@@ -33,30 +33,30 @@ __export(manifest_exports, {
|
|
|
33
33
|
module.exports = __toCommonJS(manifest_exports);
|
|
34
34
|
var import_path = __toESM(require("path"));
|
|
35
35
|
var import_utils = require("@modern-js/utils");
|
|
36
|
-
function mergeStats(browserStats, nodeStats
|
|
36
|
+
function mergeStats(browserStats, nodeStats) {
|
|
37
37
|
const ssrRemoteEntry = nodeStats.metaData.remoteEntry;
|
|
38
38
|
browserStats.metaData.ssrRemoteEntry = ssrRemoteEntry;
|
|
39
39
|
if ("publicPath" in browserStats.metaData) {
|
|
40
|
-
browserStats.metaData.ssrPublicPath =
|
|
40
|
+
browserStats.metaData.ssrPublicPath = nodeStats.metaData.publicPath;
|
|
41
41
|
}
|
|
42
42
|
return browserStats;
|
|
43
43
|
}
|
|
44
|
-
function mergeManifest(browserManifest, nodeManifest
|
|
44
|
+
function mergeManifest(browserManifest, nodeManifest) {
|
|
45
45
|
const ssrRemoteEntry = nodeManifest.metaData.remoteEntry;
|
|
46
46
|
browserManifest.metaData.ssrRemoteEntry = ssrRemoteEntry;
|
|
47
47
|
if ("publicPath" in browserManifest.metaData) {
|
|
48
|
-
browserManifest.metaData.ssrPublicPath =
|
|
48
|
+
browserManifest.metaData.ssrPublicPath = nodeManifest.metaData.publicPath;
|
|
49
49
|
}
|
|
50
50
|
return browserManifest;
|
|
51
51
|
}
|
|
52
|
-
function mergeStatsAndManifest(nodePlugin, browserPlugin
|
|
52
|
+
function mergeStatsAndManifest(nodePlugin, browserPlugin) {
|
|
53
53
|
const nodeResourceInfo = nodePlugin.statsResourceInfo;
|
|
54
54
|
const browserResourceInfo = browserPlugin.statsResourceInfo;
|
|
55
55
|
if (!browserResourceInfo || !nodeResourceInfo || !browserResourceInfo.stats || !nodeResourceInfo.stats || !browserResourceInfo.manifest || !nodeResourceInfo.manifest) {
|
|
56
56
|
throw new Error("can not get browserResourceInfo or nodeResourceInfo");
|
|
57
57
|
}
|
|
58
|
-
const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats
|
|
59
|
-
const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest
|
|
58
|
+
const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats);
|
|
59
|
+
const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest);
|
|
60
60
|
return {
|
|
61
61
|
mergedStats,
|
|
62
62
|
mergedStatsFilePath: browserResourceInfo.stats.filename,
|
|
@@ -64,8 +64,8 @@ function mergeStatsAndManifest(nodePlugin, browserPlugin, ssrPublicPath) {
|
|
|
64
64
|
mergedManifestFilePath: browserResourceInfo.manifest.filename
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
|
-
function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir
|
|
68
|
-
const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin
|
|
67
|
+
function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir) {
|
|
68
|
+
const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin);
|
|
69
69
|
import_utils.fs.writeFileSync(import_path.default.resolve(outputDir, mergedStatsFilePath), JSON.stringify(mergedStats, null, 2));
|
|
70
70
|
import_utils.fs.writeFileSync(import_path.default.resolve(outputDir, mergedManifestFilePath), JSON.stringify(mergedManifest, null, 2));
|
|
71
71
|
}
|
|
@@ -48,7 +48,6 @@ function setEnv() {
|
|
|
48
48
|
process.env["MF_SSR_PRJ"] = "true";
|
|
49
49
|
}
|
|
50
50
|
const CHAIN_MF_PLUGIN_ID = "plugin-module-federation-server";
|
|
51
|
-
let ssrPublicPath = "";
|
|
52
51
|
const mfSSRRsbuildPlugin = (pluginOptions) => {
|
|
53
52
|
return {
|
|
54
53
|
name: "@modern-js/plugin-mf-post-config",
|
|
@@ -79,8 +78,7 @@ const mfSSRRsbuildPlugin = (pluginOptions) => {
|
|
|
79
78
|
if (ssrEnv !== utils.environment.name) {
|
|
80
79
|
return config;
|
|
81
80
|
}
|
|
82
|
-
|
|
83
|
-
config.output.publicPath = ssrPublicPath;
|
|
81
|
+
config.output.publicPath = `${config.output.publicPath}${import_path.default.relative(csrOutputPath, ssrOutputPath)}/`;
|
|
84
82
|
return config;
|
|
85
83
|
};
|
|
86
84
|
api.modifyWebpackConfig((config, utils) => {
|
|
@@ -193,11 +191,11 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
|
|
|
193
191
|
});
|
|
194
192
|
api.onAfterBuild(() => {
|
|
195
193
|
const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
|
|
196
|
-
(0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir
|
|
194
|
+
(0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
|
|
197
195
|
});
|
|
198
196
|
api.onDevCompileDone(() => {
|
|
199
197
|
const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
|
|
200
|
-
(0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir
|
|
198
|
+
(0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
|
|
201
199
|
});
|
|
202
200
|
}
|
|
203
201
|
});
|
package/dist/esm/cli/manifest.js
CHANGED
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import { fs } from "@modern-js/utils";
|
|
3
|
-
function mergeStats(browserStats, nodeStats
|
|
3
|
+
function mergeStats(browserStats, nodeStats) {
|
|
4
4
|
var ssrRemoteEntry = nodeStats.metaData.remoteEntry;
|
|
5
5
|
browserStats.metaData.ssrRemoteEntry = ssrRemoteEntry;
|
|
6
6
|
if ("publicPath" in browserStats.metaData) {
|
|
7
|
-
browserStats.metaData.ssrPublicPath =
|
|
7
|
+
browserStats.metaData.ssrPublicPath = nodeStats.metaData.publicPath;
|
|
8
8
|
}
|
|
9
9
|
return browserStats;
|
|
10
10
|
}
|
|
11
|
-
function mergeManifest(browserManifest, nodeManifest
|
|
11
|
+
function mergeManifest(browserManifest, nodeManifest) {
|
|
12
12
|
var ssrRemoteEntry = nodeManifest.metaData.remoteEntry;
|
|
13
13
|
browserManifest.metaData.ssrRemoteEntry = ssrRemoteEntry;
|
|
14
14
|
if ("publicPath" in browserManifest.metaData) {
|
|
15
|
-
browserManifest.metaData.ssrPublicPath =
|
|
15
|
+
browserManifest.metaData.ssrPublicPath = nodeManifest.metaData.publicPath;
|
|
16
16
|
}
|
|
17
17
|
return browserManifest;
|
|
18
18
|
}
|
|
19
|
-
function mergeStatsAndManifest(nodePlugin, browserPlugin
|
|
19
|
+
function mergeStatsAndManifest(nodePlugin, browserPlugin) {
|
|
20
20
|
var nodeResourceInfo = nodePlugin.statsResourceInfo;
|
|
21
21
|
var browserResourceInfo = browserPlugin.statsResourceInfo;
|
|
22
22
|
if (!browserResourceInfo || !nodeResourceInfo || !browserResourceInfo.stats || !nodeResourceInfo.stats || !browserResourceInfo.manifest || !nodeResourceInfo.manifest) {
|
|
23
23
|
throw new Error("can not get browserResourceInfo or nodeResourceInfo");
|
|
24
24
|
}
|
|
25
|
-
var mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats
|
|
26
|
-
var mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest
|
|
25
|
+
var mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats);
|
|
26
|
+
var mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest);
|
|
27
27
|
return {
|
|
28
28
|
mergedStats,
|
|
29
29
|
mergedStatsFilePath: browserResourceInfo.stats.filename,
|
|
@@ -31,8 +31,8 @@ function mergeStatsAndManifest(nodePlugin, browserPlugin, ssrPublicPath) {
|
|
|
31
31
|
mergedManifestFilePath: browserResourceInfo.manifest.filename
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
-
function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir
|
|
35
|
-
var _mergeStatsAndManifest = mergeStatsAndManifest(nodePlugin, browserPlugin
|
|
34
|
+
function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir) {
|
|
35
|
+
var _mergeStatsAndManifest = mergeStatsAndManifest(nodePlugin, browserPlugin), mergedStats = _mergeStatsAndManifest.mergedStats, mergedStatsFilePath = _mergeStatsAndManifest.mergedStatsFilePath, mergedManifest = _mergeStatsAndManifest.mergedManifest, mergedManifestFilePath = _mergeStatsAndManifest.mergedManifestFilePath;
|
|
36
36
|
fs.writeFileSync(path.resolve(outputDir, mergedStatsFilePath), JSON.stringify(mergedStats, null, 2));
|
|
37
37
|
fs.writeFileSync(path.resolve(outputDir, mergedManifestFilePath), JSON.stringify(mergedManifest, null, 2));
|
|
38
38
|
}
|
|
@@ -14,7 +14,6 @@ function setEnv() {
|
|
|
14
14
|
process.env["MF_SSR_PRJ"] = "true";
|
|
15
15
|
}
|
|
16
16
|
var CHAIN_MF_PLUGIN_ID = "plugin-module-federation-server";
|
|
17
|
-
var ssrPublicPath = "";
|
|
18
17
|
var mfSSRRsbuildPlugin = function(pluginOptions) {
|
|
19
18
|
return {
|
|
20
19
|
name: "@modern-js/plugin-mf-post-config",
|
|
@@ -46,8 +45,7 @@ var mfSSRRsbuildPlugin = function(pluginOptions) {
|
|
|
46
45
|
if (ssrEnv !== utils.environment.name) {
|
|
47
46
|
return config;
|
|
48
47
|
}
|
|
49
|
-
|
|
50
|
-
config.output.publicPath = ssrPublicPath;
|
|
48
|
+
config.output.publicPath = "".concat(config.output.publicPath).concat(path.relative(csrOutputPath, ssrOutputPath), "/");
|
|
51
49
|
return config;
|
|
52
50
|
};
|
|
53
51
|
api.modifyWebpackConfig(function(config, utils) {
|
|
@@ -165,11 +163,11 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
|
|
|
165
163
|
});
|
|
166
164
|
api.onAfterBuild(function() {
|
|
167
165
|
var nodePlugin = pluginOptions.nodePlugin, browserPlugin = pluginOptions.browserPlugin, distOutputDir = pluginOptions.distOutputDir;
|
|
168
|
-
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir
|
|
166
|
+
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
|
|
169
167
|
});
|
|
170
168
|
api.onDevCompileDone(function() {
|
|
171
169
|
var nodePlugin = pluginOptions.nodePlugin, browserPlugin = pluginOptions.browserPlugin, distOutputDir = pluginOptions.distOutputDir;
|
|
172
|
-
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir
|
|
170
|
+
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
|
|
173
171
|
});
|
|
174
172
|
return [
|
|
175
173
|
2
|
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import { fs } from "@modern-js/utils";
|
|
3
|
-
function mergeStats(browserStats, nodeStats
|
|
3
|
+
function mergeStats(browserStats, nodeStats) {
|
|
4
4
|
const ssrRemoteEntry = nodeStats.metaData.remoteEntry;
|
|
5
5
|
browserStats.metaData.ssrRemoteEntry = ssrRemoteEntry;
|
|
6
6
|
if ("publicPath" in browserStats.metaData) {
|
|
7
|
-
browserStats.metaData.ssrPublicPath =
|
|
7
|
+
browserStats.metaData.ssrPublicPath = nodeStats.metaData.publicPath;
|
|
8
8
|
}
|
|
9
9
|
return browserStats;
|
|
10
10
|
}
|
|
11
|
-
function mergeManifest(browserManifest, nodeManifest
|
|
11
|
+
function mergeManifest(browserManifest, nodeManifest) {
|
|
12
12
|
const ssrRemoteEntry = nodeManifest.metaData.remoteEntry;
|
|
13
13
|
browserManifest.metaData.ssrRemoteEntry = ssrRemoteEntry;
|
|
14
14
|
if ("publicPath" in browserManifest.metaData) {
|
|
15
|
-
browserManifest.metaData.ssrPublicPath =
|
|
15
|
+
browserManifest.metaData.ssrPublicPath = nodeManifest.metaData.publicPath;
|
|
16
16
|
}
|
|
17
17
|
return browserManifest;
|
|
18
18
|
}
|
|
19
|
-
function mergeStatsAndManifest(nodePlugin, browserPlugin
|
|
19
|
+
function mergeStatsAndManifest(nodePlugin, browserPlugin) {
|
|
20
20
|
const nodeResourceInfo = nodePlugin.statsResourceInfo;
|
|
21
21
|
const browserResourceInfo = browserPlugin.statsResourceInfo;
|
|
22
22
|
if (!browserResourceInfo || !nodeResourceInfo || !browserResourceInfo.stats || !nodeResourceInfo.stats || !browserResourceInfo.manifest || !nodeResourceInfo.manifest) {
|
|
23
23
|
throw new Error("can not get browserResourceInfo or nodeResourceInfo");
|
|
24
24
|
}
|
|
25
|
-
const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats
|
|
26
|
-
const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest
|
|
25
|
+
const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats);
|
|
26
|
+
const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest);
|
|
27
27
|
return {
|
|
28
28
|
mergedStats,
|
|
29
29
|
mergedStatsFilePath: browserResourceInfo.stats.filename,
|
|
@@ -31,8 +31,8 @@ function mergeStatsAndManifest(nodePlugin, browserPlugin, ssrPublicPath) {
|
|
|
31
31
|
mergedManifestFilePath: browserResourceInfo.manifest.filename
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
-
function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir
|
|
35
|
-
const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin
|
|
34
|
+
function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir) {
|
|
35
|
+
const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin);
|
|
36
36
|
fs.writeFileSync(path.resolve(outputDir, mergedStatsFilePath), JSON.stringify(mergedStats, null, 2));
|
|
37
37
|
fs.writeFileSync(path.resolve(outputDir, mergedManifestFilePath), JSON.stringify(mergedManifest, null, 2));
|
|
38
38
|
}
|
|
@@ -12,7 +12,6 @@ function setEnv() {
|
|
|
12
12
|
process.env["MF_SSR_PRJ"] = "true";
|
|
13
13
|
}
|
|
14
14
|
const CHAIN_MF_PLUGIN_ID = "plugin-module-federation-server";
|
|
15
|
-
let ssrPublicPath = "";
|
|
16
15
|
const mfSSRRsbuildPlugin = (pluginOptions) => {
|
|
17
16
|
return {
|
|
18
17
|
name: "@modern-js/plugin-mf-post-config",
|
|
@@ -43,8 +42,7 @@ const mfSSRRsbuildPlugin = (pluginOptions) => {
|
|
|
43
42
|
if (ssrEnv !== utils.environment.name) {
|
|
44
43
|
return config;
|
|
45
44
|
}
|
|
46
|
-
|
|
47
|
-
config.output.publicPath = ssrPublicPath;
|
|
45
|
+
config.output.publicPath = `${config.output.publicPath}${path.relative(csrOutputPath, ssrOutputPath)}/`;
|
|
48
46
|
return config;
|
|
49
47
|
};
|
|
50
48
|
api.modifyWebpackConfig((config, utils) => {
|
|
@@ -157,11 +155,11 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
|
|
|
157
155
|
});
|
|
158
156
|
api.onAfterBuild(() => {
|
|
159
157
|
const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
|
|
160
|
-
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir
|
|
158
|
+
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
|
|
161
159
|
});
|
|
162
160
|
api.onDevCompileDone(() => {
|
|
163
161
|
const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
|
|
164
|
-
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir
|
|
162
|
+
updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
|
|
165
163
|
});
|
|
166
164
|
}
|
|
167
165
|
});
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { BundlerPlugin } from '../types';
|
|
2
|
-
export declare function updateStatsAndManifest(nodePlugin: BundlerPlugin, browserPlugin: BundlerPlugin, outputDir: string
|
|
2
|
+
export declare function updateStatsAndManifest(nodePlugin: BundlerPlugin, browserPlugin: BundlerPlugin, outputDir: string): void;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/modern-js",
|
|
3
|
-
"version": "0.0.0-next-
|
|
3
|
+
"version": "0.0.0-next-20250403063747",
|
|
4
4
|
"files": [
|
|
5
5
|
"dist/",
|
|
6
6
|
"types.d.ts",
|
|
@@ -89,11 +89,11 @@
|
|
|
89
89
|
"@swc/helpers": "0.5.13",
|
|
90
90
|
"node-fetch": "~3.3.0",
|
|
91
91
|
"react-error-boundary": "4.1.2",
|
|
92
|
-
"@module-federation/rsbuild-plugin": "0.0.0-next-
|
|
93
|
-
"@module-federation/enhanced": "0.0.0-next-
|
|
94
|
-
"@module-federation/node": "0.0.0-next-
|
|
95
|
-
"@module-federation/sdk": "0.0.0-next-
|
|
96
|
-
"@module-federation/cli": "0.0.0-next-
|
|
92
|
+
"@module-federation/rsbuild-plugin": "0.0.0-next-20250403063747",
|
|
93
|
+
"@module-federation/enhanced": "0.0.0-next-20250403063747",
|
|
94
|
+
"@module-federation/node": "0.0.0-next-20250403063747",
|
|
95
|
+
"@module-federation/sdk": "0.0.0-next-20250403063747",
|
|
96
|
+
"@module-federation/cli": "0.0.0-next-20250403063747"
|
|
97
97
|
},
|
|
98
98
|
"devDependencies": {
|
|
99
99
|
"@rsbuild/core": "1.2.8",
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
"@modern-js/module-tools": "2.65.1",
|
|
103
103
|
"@modern-js/runtime": "2.65.1",
|
|
104
104
|
"@modern-js/tsconfig": "2.65.1",
|
|
105
|
-
"@module-federation/manifest": "0.0.0-next-
|
|
105
|
+
"@module-federation/manifest": "0.0.0-next-20250403063747"
|
|
106
106
|
},
|
|
107
107
|
"peerDependencies": {
|
|
108
108
|
"react": ">=17",
|