@module-federation/modern-js 0.0.0-next-20250221081237 → 0.0.0-next-20250221090527

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.
Files changed (8) hide show
  1. package/dist/cjs/cli/manifest.js +9 -10
  2. package/dist/cjs/cli/ssrPlugin.js +10 -2
  3. package/dist/esm/cli/manifest.js +9 -10
  4. package/dist/esm/cli/ssrPlugin.js +11 -3
  5. package/dist/esm-node/cli/manifest.js +9 -10
  6. package/dist/esm-node/cli/ssrPlugin.js +10 -2
  7. package/dist/types/cli/manifest.d.ts +1 -1
  8. package/package.json +6 -6
package/dist/cjs/cli/manifest.js CHANGED
@@ -33,27 +33,26 @@ __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
- var import_constant = require("../constant");
37
- function mergeStats(browserStats, nodeStats) {
36
+ function mergeStats(browserStats, nodeStats, ssrDir) {
38
37
  const ssrRemoteEntry = nodeStats.metaData.remoteEntry;
39
- ssrRemoteEntry.path = import_constant.MODERN_JS_SERVER_DIR;
38
+ ssrRemoteEntry.path = ssrDir;
40
39
  browserStats.metaData.ssrRemoteEntry = ssrRemoteEntry;
41
40
  return browserStats;
42
41
  }
43
- function mergeManifest(browserManifest, nodeManifest) {
42
+ function mergeManifest(browserManifest, nodeManifest, ssrDir) {
44
43
  const ssrRemoteEntry = nodeManifest.metaData.remoteEntry;
45
- ssrRemoteEntry.path = import_constant.MODERN_JS_SERVER_DIR;
44
+ ssrRemoteEntry.path = ssrDir;
46
45
  browserManifest.metaData.ssrRemoteEntry = ssrRemoteEntry;
47
46
  return browserManifest;
48
47
  }
49
- function mergeStatsAndManifest(nodePlugin, browserPlugin) {
48
+ function mergeStatsAndManifest(nodePlugin, browserPlugin, ssrDir) {
50
49
  const nodeResourceInfo = nodePlugin.statsResourceInfo;
51
50
  const browserResourceInfo = browserPlugin.statsResourceInfo;
52
51
  if (!browserResourceInfo || !nodeResourceInfo || !browserResourceInfo.stats || !nodeResourceInfo.stats || !browserResourceInfo.manifest || !nodeResourceInfo.manifest) {
53
52
  throw new Error("can not get browserResourceInfo or nodeResourceInfo");
54
53
  }
55
- const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats);
56
- const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest);
54
+ const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats, ssrDir);
55
+ const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest, ssrDir);
57
56
  return {
58
57
  mergedStats,
59
58
  mergedStatsFilePath: browserResourceInfo.stats.filename,
@@ -61,8 +60,8 @@ function mergeStatsAndManifest(nodePlugin, browserPlugin) {
61
60
  mergedManifestFilePath: browserResourceInfo.manifest.filename
62
61
  };
63
62
  }
64
- function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir) {
65
- const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin);
63
+ function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir, ssrDir) {
64
+ const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin, ssrDir);
66
65
  import_utils.fs.writeFileSync(import_path.default.resolve(outputDir, mergedStatsFilePath), JSON.stringify(mergedStats, null, 2));
67
66
  import_utils.fs.writeFileSync(import_path.default.resolve(outputDir, mergedManifestFilePath), JSON.stringify(mergedManifest, null, 2));
68
67
  }
package/dist/cjs/cli/ssrPlugin.js CHANGED
@@ -41,6 +41,7 @@ var import_rspack = require("@module-federation/enhanced/rspack");
41
41
  var import_universe_entry_chunk_tracker_plugin = __toESM(require("@module-federation/node/universe-entry-chunk-tracker-plugin"));
42
42
  var import_manifest = require("./manifest");
43
43
  var import_constant = require("./constant");
44
+ var import_constant2 = require("../constant");
44
45
  var import_logger = __toESM(require("./logger"));
45
46
  function setEnv() {
46
47
  process.env["MF_DISABLE_EMIT_STATS"] = "true";
@@ -58,6 +59,8 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
58
59
  const modernjsConfig = api.getConfig();
59
60
  var _pluginOptions_userConfig_ssr;
60
61
  const 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);
62
+ let csrOutputPath = "";
63
+ let ssrOutputPath = "";
61
64
  if (!enableSSR) {
62
65
  return;
63
66
  }
@@ -103,6 +106,11 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
103
106
  "@module-federation/node/utils": "NOT_USED_IN_BROWSER"
104
107
  });
105
108
  }
109
+ if (isServer) {
110
+ ssrOutputPath = chain.output.get("path") || import_path.default.resolve(process.cwd(), `dist/${import_constant2.MODERN_JS_SERVER_DIR}`);
111
+ } else {
112
+ csrOutputPath = chain.output.get("path") || import_path.default.resolve(process.cwd(), "dist");
113
+ }
106
114
  });
107
115
  api.config(() => {
108
116
  return {
@@ -138,11 +146,11 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
138
146
  });
139
147
  api.onAfterBuild(() => {
140
148
  const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
141
- (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
149
+ (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir, import_path.default.relative(csrOutputPath, ssrOutputPath));
142
150
  });
143
151
  api.onDevCompileDone(() => {
144
152
  const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
145
- (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
153
+ (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir, import_path.default.relative(csrOutputPath, ssrOutputPath));
146
154
  });
147
155
  }
148
156
  });
package/dist/esm/cli/manifest.js CHANGED
@@ -1,26 +1,25 @@
1
1
  import path from "path";
2
2
  import { fs } from "@modern-js/utils";
3
- import { MODERN_JS_SERVER_DIR } from "../constant";
4
- function mergeStats(browserStats, nodeStats) {
3
+ function mergeStats(browserStats, nodeStats, ssrDir) {
5
4
  var ssrRemoteEntry = nodeStats.metaData.remoteEntry;
6
- ssrRemoteEntry.path = MODERN_JS_SERVER_DIR;
5
+ ssrRemoteEntry.path = ssrDir;
7
6
  browserStats.metaData.ssrRemoteEntry = ssrRemoteEntry;
8
7
  return browserStats;
9
8
  }
10
- function mergeManifest(browserManifest, nodeManifest) {
9
+ function mergeManifest(browserManifest, nodeManifest, ssrDir) {
11
10
  var ssrRemoteEntry = nodeManifest.metaData.remoteEntry;
12
- ssrRemoteEntry.path = MODERN_JS_SERVER_DIR;
11
+ ssrRemoteEntry.path = ssrDir;
13
12
  browserManifest.metaData.ssrRemoteEntry = ssrRemoteEntry;
14
13
  return browserManifest;
15
14
  }
16
- function mergeStatsAndManifest(nodePlugin, browserPlugin) {
15
+ function mergeStatsAndManifest(nodePlugin, browserPlugin, ssrDir) {
17
16
  var nodeResourceInfo = nodePlugin.statsResourceInfo;
18
17
  var browserResourceInfo = browserPlugin.statsResourceInfo;
19
18
  if (!browserResourceInfo || !nodeResourceInfo || !browserResourceInfo.stats || !nodeResourceInfo.stats || !browserResourceInfo.manifest || !nodeResourceInfo.manifest) {
20
19
  throw new Error("can not get browserResourceInfo or nodeResourceInfo");
21
20
  }
22
- var mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats);
23
- var mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest);
21
+ var mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats, ssrDir);
22
+ var mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest, ssrDir);
24
23
  return {
25
24
  mergedStats,
26
25
  mergedStatsFilePath: browserResourceInfo.stats.filename,
@@ -28,8 +27,8 @@ function mergeStatsAndManifest(nodePlugin, browserPlugin) {
28
27
  mergedManifestFilePath: browserResourceInfo.manifest.filename
29
28
  };
30
29
  }
31
- function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir) {
32
- var _mergeStatsAndManifest = mergeStatsAndManifest(nodePlugin, browserPlugin), mergedStats = _mergeStatsAndManifest.mergedStats, mergedStatsFilePath = _mergeStatsAndManifest.mergedStatsFilePath, mergedManifest = _mergeStatsAndManifest.mergedManifest, mergedManifestFilePath = _mergeStatsAndManifest.mergedManifestFilePath;
30
+ function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir, ssrDir) {
31
+ var _mergeStatsAndManifest = mergeStatsAndManifest(nodePlugin, browserPlugin, ssrDir), mergedStats = _mergeStatsAndManifest.mergedStats, mergedStatsFilePath = _mergeStatsAndManifest.mergedStatsFilePath, mergedManifest = _mergeStatsAndManifest.mergedManifest, mergedManifestFilePath = _mergeStatsAndManifest.mergedManifestFilePath;
33
32
  fs.writeFileSync(path.resolve(outputDir, mergedStatsFilePath), JSON.stringify(mergedStats, null, 2));
34
33
  fs.writeFileSync(path.resolve(outputDir, mergedManifestFilePath), JSON.stringify(mergedManifest, null, 2));
35
34
  }
package/dist/esm/cli/ssrPlugin.js CHANGED
@@ -7,6 +7,7 @@ import { ModuleFederationPlugin as RspackModuleFederationPlugin } from "@module-
7
7
  import UniverseEntryChunkTrackerPlugin from "@module-federation/node/universe-entry-chunk-tracker-plugin";
8
8
  import { updateStatsAndManifest } from "./manifest";
9
9
  import { isDev } from "./constant";
10
+ import { MODERN_JS_SERVER_DIR } from "../constant";
10
11
  import logger from "./logger";
11
12
  function setEnv() {
12
13
  process.env["MF_DISABLE_EMIT_STATS"] = "true";
@@ -22,10 +23,12 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
22
23
  ],
23
24
  setup: function() {
24
25
  var _ref = _async_to_generator(function(api) {
25
- var _pluginOptions_userConfig, _modernjsConfig_server, modernjsConfig, _pluginOptions_userConfig_ssr, enableSSR;
26
+ var _pluginOptions_userConfig, _modernjsConfig_server, modernjsConfig, _pluginOptions_userConfig_ssr, enableSSR, csrOutputPath, ssrOutputPath;
26
27
  return _ts_generator(this, function(_state) {
27
28
  modernjsConfig = api.getConfig();
28
29
  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);
30
+ csrOutputPath = "";
31
+ ssrOutputPath = "";
29
32
  if (!enableSSR) {
30
33
  return [
31
34
  2
@@ -75,6 +78,11 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
75
78
  "@module-federation/node/utils": "NOT_USED_IN_BROWSER"
76
79
  });
77
80
  }
81
+ if (isServer) {
82
+ ssrOutputPath = chain.output.get("path") || path.resolve(process.cwd(), "dist/".concat(MODERN_JS_SERVER_DIR));
83
+ } else {
84
+ csrOutputPath = chain.output.get("path") || path.resolve(process.cwd(), "dist");
85
+ }
78
86
  });
79
87
  api.config(function() {
80
88
  return {
@@ -110,11 +118,11 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
110
118
  });
111
119
  api.onAfterBuild(function() {
112
120
  var nodePlugin = pluginOptions.nodePlugin, browserPlugin = pluginOptions.browserPlugin, distOutputDir = pluginOptions.distOutputDir;
113
- updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
121
+ updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir, path.relative(csrOutputPath, ssrOutputPath));
114
122
  });
115
123
  api.onDevCompileDone(function() {
116
124
  var nodePlugin = pluginOptions.nodePlugin, browserPlugin = pluginOptions.browserPlugin, distOutputDir = pluginOptions.distOutputDir;
117
- updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
125
+ updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir, path.relative(csrOutputPath, ssrOutputPath));
118
126
  });
119
127
  return [
120
128
  2
package/dist/esm-node/cli/manifest.js CHANGED
@@ -1,26 +1,25 @@
1
1
  import path from "path";
2
2
  import { fs } from "@modern-js/utils";
3
- import { MODERN_JS_SERVER_DIR } from "../constant";
4
- function mergeStats(browserStats, nodeStats) {
3
+ function mergeStats(browserStats, nodeStats, ssrDir) {
5
4
  const ssrRemoteEntry = nodeStats.metaData.remoteEntry;
6
- ssrRemoteEntry.path = MODERN_JS_SERVER_DIR;
5
+ ssrRemoteEntry.path = ssrDir;
7
6
  browserStats.metaData.ssrRemoteEntry = ssrRemoteEntry;
8
7
  return browserStats;
9
8
  }
10
- function mergeManifest(browserManifest, nodeManifest) {
9
+ function mergeManifest(browserManifest, nodeManifest, ssrDir) {
11
10
  const ssrRemoteEntry = nodeManifest.metaData.remoteEntry;
12
- ssrRemoteEntry.path = MODERN_JS_SERVER_DIR;
11
+ ssrRemoteEntry.path = ssrDir;
13
12
  browserManifest.metaData.ssrRemoteEntry = ssrRemoteEntry;
14
13
  return browserManifest;
15
14
  }
16
- function mergeStatsAndManifest(nodePlugin, browserPlugin) {
15
+ function mergeStatsAndManifest(nodePlugin, browserPlugin, ssrDir) {
17
16
  const nodeResourceInfo = nodePlugin.statsResourceInfo;
18
17
  const browserResourceInfo = browserPlugin.statsResourceInfo;
19
18
  if (!browserResourceInfo || !nodeResourceInfo || !browserResourceInfo.stats || !nodeResourceInfo.stats || !browserResourceInfo.manifest || !nodeResourceInfo.manifest) {
20
19
  throw new Error("can not get browserResourceInfo or nodeResourceInfo");
21
20
  }
22
- const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats);
23
- const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest);
21
+ const mergedStats = mergeStats(browserResourceInfo.stats.stats, nodeResourceInfo.stats.stats, ssrDir);
22
+ const mergedManifest = mergeManifest(browserResourceInfo.manifest.manifest, nodeResourceInfo.manifest.manifest, ssrDir);
24
23
  return {
25
24
  mergedStats,
26
25
  mergedStatsFilePath: browserResourceInfo.stats.filename,
@@ -28,8 +27,8 @@ function mergeStatsAndManifest(nodePlugin, browserPlugin) {
28
27
  mergedManifestFilePath: browserResourceInfo.manifest.filename
29
28
  };
30
29
  }
31
- function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir) {
32
- const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin);
30
+ function updateStatsAndManifest(nodePlugin, browserPlugin, outputDir, ssrDir) {
31
+ const { mergedStats, mergedStatsFilePath, mergedManifest, mergedManifestFilePath } = mergeStatsAndManifest(nodePlugin, browserPlugin, ssrDir);
33
32
  fs.writeFileSync(path.resolve(outputDir, mergedStatsFilePath), JSON.stringify(mergedStats, null, 2));
34
33
  fs.writeFileSync(path.resolve(outputDir, mergedManifestFilePath), JSON.stringify(mergedManifest, null, 2));
35
34
  }
package/dist/esm-node/cli/ssrPlugin.js CHANGED
@@ -5,6 +5,7 @@ import { ModuleFederationPlugin as RspackModuleFederationPlugin } from "@module-
5
5
  import UniverseEntryChunkTrackerPlugin from "@module-federation/node/universe-entry-chunk-tracker-plugin";
6
6
  import { updateStatsAndManifest } from "./manifest";
7
7
  import { isDev } from "./constant";
8
+ import { MODERN_JS_SERVER_DIR } from "../constant";
8
9
  import logger from "./logger";
9
10
  function setEnv() {
10
11
  process.env["MF_DISABLE_EMIT_STATS"] = "true";
@@ -22,6 +23,8 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
22
23
  const modernjsConfig = api.getConfig();
23
24
  var _pluginOptions_userConfig_ssr;
24
25
  const 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);
26
+ let csrOutputPath = "";
27
+ let ssrOutputPath = "";
25
28
  if (!enableSSR) {
26
29
  return;
27
30
  }
@@ -67,6 +70,11 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
67
70
  "@module-federation/node/utils": "NOT_USED_IN_BROWSER"
68
71
  });
69
72
  }
73
+ if (isServer) {
74
+ ssrOutputPath = chain.output.get("path") || path.resolve(process.cwd(), `dist/${MODERN_JS_SERVER_DIR}`);
75
+ } else {
76
+ csrOutputPath = chain.output.get("path") || path.resolve(process.cwd(), "dist");
77
+ }
70
78
  });
71
79
  api.config(() => {
72
80
  return {
@@ -102,11 +110,11 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
102
110
  });
103
111
  api.onAfterBuild(() => {
104
112
  const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
105
- updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
113
+ updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir, path.relative(csrOutputPath, ssrOutputPath));
106
114
  });
107
115
  api.onDevCompileDone(() => {
108
116
  const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
109
- updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
117
+ updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir, path.relative(csrOutputPath, ssrOutputPath));
110
118
  });
111
119
  }
112
120
  });
package/dist/types/cli/manifest.d.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  import { BundlerPlugin } from '../types';
2
- export declare function updateStatsAndManifest(nodePlugin: BundlerPlugin, browserPlugin: BundlerPlugin, outputDir: string): void;
2
+ export declare function updateStatsAndManifest(nodePlugin: BundlerPlugin, browserPlugin: BundlerPlugin, outputDir: string, ssrDir: 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-20250221081237",
3
+ "version": "0.0.0-next-20250221090527",
4
4
  "files": [
5
5
  "dist/",
6
6
  "types.d.ts",
@@ -89,10 +89,10 @@
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-20250221081237",
93
- "@module-federation/enhanced": "0.0.0-next-20250221081237",
94
- "@module-federation/node": "0.0.0-next-20250221081237",
95
- "@module-federation/sdk": "0.0.0-next-20250221081237"
92
+ "@module-federation/rsbuild-plugin": "0.0.0-next-20250221090527",
93
+ "@module-federation/enhanced": "0.0.0-next-20250221090527",
94
+ "@module-federation/node": "0.0.0-next-20250221090527",
95
+ "@module-federation/sdk": "0.0.0-next-20250221090527"
96
96
  },
97
97
  "devDependencies": {
98
98
  "@modern-js/app-tools": "2.64.3",
@@ -100,7 +100,7 @@
100
100
  "@modern-js/module-tools": "2.64.3",
101
101
  "@modern-js/runtime": "2.64.3",
102
102
  "@modern-js/tsconfig": "2.64.3",
103
- "@module-federation/manifest": "0.0.0-next-20250221081237"
103
+ "@module-federation/manifest": "0.0.0-next-20250221090527"
104
104
  },
105
105
  "peerDependencies": {
106
106
  "react": ">=17",