@module-federation/modern-js-v3 2.5.1 → 2.6.0

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/configPlugin.js +2 -2
  2. package/dist/cjs/cli/ssrPlugin.js +19 -1
  3. package/dist/esm/cli/configPlugin.mjs +2 -2
  4. package/dist/esm/cli/ssrPlugin.mjs +32 -1
  5. package/dist/esm-node/cli/configPlugin.mjs +2 -2
  6. package/dist/esm-node/cli/ssrPlugin.mjs +19 -1
  7. package/dist/types/cli/ssrPlugin.spec.d.ts +1 -0
  8. package/package.json +10 -9
package/dist/cjs/cli/configPlugin.js CHANGED
@@ -89,9 +89,9 @@ var __webpack_exports__ = {};
89
89
  const getMFConfig = async (userConfig)=>{
90
90
  const { config, configPath } = userConfig;
91
91
  if (config) return config;
92
- const mfConfigPath = configPath ? configPath : defaultPath;
92
+ const mfConfigPath = external_path_default().resolve(configPath || defaultPath);
93
93
  const { createJiti } = __webpack_require__("jiti");
94
- const jit = createJiti(__filename, {
94
+ const jit = createJiti(mfConfigPath, {
95
95
  interopDefault: true
96
96
  });
97
97
  const configModule = await jit(mfConfigPath);
package/dist/cjs/cli/ssrPlugin.js CHANGED
@@ -71,6 +71,22 @@ function getManifestAssetFileNames(manifestOption) {
71
71
  manifestFileName: (0, sdk_namespaceObject.simpleJoinRemoteEntry)(filePath, manifestFileName)
72
72
  };
73
73
  }
74
+ const STATIC_ASSET_MODULE_TYPES = [
75
+ 'asset',
76
+ 'asset/resource'
77
+ ];
78
+ const preserveStaticAssetPublicPath = (config, publicPath)=>{
79
+ var _config, _moduleConfig;
80
+ if ('string' != typeof publicPath || '' === publicPath || 'auto' === publicPath) return;
81
+ (_config = config).module || (_config.module = {});
82
+ const moduleConfig = config.module;
83
+ (_moduleConfig = moduleConfig).generator || (_moduleConfig.generator = {});
84
+ for (const moduleType of STATIC_ASSET_MODULE_TYPES){
85
+ var _moduleConfig_generator, _moduleType, _moduleConfig_generator_moduleType;
86
+ (_moduleConfig_generator = moduleConfig.generator)[_moduleType = moduleType] || (_moduleConfig_generator[_moduleType] = {});
87
+ null != (_moduleConfig_generator_moduleType = moduleConfig.generator[moduleType]).publicPath || (_moduleConfig_generator_moduleType.publicPath = publicPath);
88
+ }
89
+ };
74
90
  const mfSSRRsbuildPlugin = (pluginOptions)=>({
75
91
  name: '@modern-js/plugin-mf-post-config',
76
92
  pre: [
@@ -126,7 +142,9 @@ const mfSSRRsbuildPlugin = (pluginOptions)=>({
126
142
  if (ssrEnv !== utils.environment.name) return config;
127
143
  const userSSRConfig = pluginOptions.userConfig.ssr ? 'object' == typeof pluginOptions.userConfig.ssr ? pluginOptions.userConfig.ssr : {} : {};
128
144
  if (!userSSRConfig.distOutputDir) return;
129
- config.output.publicPath = `${config.output.publicPath}${external_path_default().relative(csrOutputPath, ssrOutputPath)}/`;
145
+ const publicPath = config.output.publicPath;
146
+ preserveStaticAssetPublicPath(config, publicPath);
147
+ config.output.publicPath = `${publicPath}${external_path_default().relative(csrOutputPath, ssrOutputPath)}/`;
130
148
  return config;
131
149
  };
132
150
  api.modifyRspackConfig((config, utils)=>{
package/dist/esm/cli/configPlugin.mjs CHANGED
@@ -64,9 +64,9 @@ var configPlugin_getMFConfig = function(userConfig) {
64
64
  2,
65
65
  config
66
66
  ];
67
- mfConfigPath = configPath ? configPath : defaultPath;
67
+ mfConfigPath = path.resolve(configPath || defaultPath);
68
68
  createJiti = __webpack_require__("jiti").createJiti;
69
- jit = createJiti(__filename, {
69
+ jit = createJiti(mfConfigPath, {
70
70
  interopDefault: true
71
71
  });
72
72
  return [
package/dist/esm/cli/ssrPlugin.mjs CHANGED
@@ -35,6 +35,35 @@ function getManifestAssetFileNames(manifestOption) {
35
35
  manifestFileName: simpleJoinRemoteEntry(filePath, manifestFileName)
36
36
  };
37
37
  }
38
+ var STATIC_ASSET_MODULE_TYPES = [
39
+ 'asset',
40
+ 'asset/resource'
41
+ ];
42
+ var ssrPlugin_preserveStaticAssetPublicPath = function(config, publicPath) {
43
+ var _config, _moduleConfig;
44
+ if ('string' != typeof publicPath || '' === publicPath || 'auto' === publicPath) return;
45
+ (_config = config).module || (_config.module = {});
46
+ var moduleConfig = config.module;
47
+ (_moduleConfig = moduleConfig).generator || (_moduleConfig.generator = {});
48
+ var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
49
+ try {
50
+ for(var _iterator = STATIC_ASSET_MODULE_TYPES[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
51
+ var moduleType = _step.value;
52
+ var _moduleConfig_generator, _moduleType, _moduleConfig_generator_moduleType;
53
+ (_moduleConfig_generator = moduleConfig.generator)[_moduleType = moduleType] || (_moduleConfig_generator[_moduleType] = {});
54
+ null != (_moduleConfig_generator_moduleType = moduleConfig.generator[moduleType]).publicPath || (_moduleConfig_generator_moduleType.publicPath = publicPath);
55
+ }
56
+ } catch (err) {
57
+ _didIteratorError = true;
58
+ _iteratorError = err;
59
+ } finally{
60
+ try {
61
+ if (!_iteratorNormalCompletion && null != _iterator.return) _iterator.return();
62
+ } finally{
63
+ if (_didIteratorError) throw _iteratorError;
64
+ }
65
+ }
66
+ };
38
67
  var ssrPlugin_mfSSRRsbuildPlugin = function(pluginOptions) {
39
68
  return {
40
69
  name: '@modern-js/plugin-mf-post-config',
@@ -92,7 +121,9 @@ var ssrPlugin_mfSSRRsbuildPlugin = function(pluginOptions) {
92
121
  if (ssrEnv !== utils.environment.name) return config;
93
122
  var userSSRConfig = pluginOptions.userConfig.ssr ? 'object' === _type_of__(pluginOptions.userConfig.ssr) ? pluginOptions.userConfig.ssr : {} : {};
94
123
  if (!userSSRConfig.distOutputDir) return;
95
- config.output.publicPath = "".concat(config.output.publicPath).concat(path.relative(csrOutputPath, ssrOutputPath), "/");
124
+ var publicPath = config.output.publicPath;
125
+ ssrPlugin_preserveStaticAssetPublicPath(config, publicPath);
126
+ config.output.publicPath = "".concat(publicPath).concat(path.relative(csrOutputPath, ssrOutputPath), "/");
96
127
  return config;
97
128
  };
98
129
  api.modifyRspackConfig(function(config, utils) {
package/dist/esm-node/cli/configPlugin.mjs CHANGED
@@ -42,9 +42,9 @@ function setEnv(enableSSR) {
42
42
  const getMFConfig = async (userConfig)=>{
43
43
  const { config, configPath } = userConfig;
44
44
  if (config) return config;
45
- const mfConfigPath = configPath ? configPath : defaultPath;
45
+ const mfConfigPath = path.resolve(configPath || defaultPath);
46
46
  const { createJiti } = __webpack_require__("jiti");
47
- const jit = createJiti(__filename, {
47
+ const jit = createJiti(mfConfigPath, {
48
48
  interopDefault: true
49
49
  });
50
50
  const configModule = await jit(mfConfigPath);
package/dist/esm-node/cli/ssrPlugin.mjs CHANGED
@@ -27,6 +27,22 @@ function getManifestAssetFileNames(manifestOption) {
27
27
  manifestFileName: simpleJoinRemoteEntry(filePath, manifestFileName)
28
28
  };
29
29
  }
30
+ const STATIC_ASSET_MODULE_TYPES = [
31
+ 'asset',
32
+ 'asset/resource'
33
+ ];
34
+ const preserveStaticAssetPublicPath = (config, publicPath)=>{
35
+ var _config, _moduleConfig;
36
+ if ('string' != typeof publicPath || '' === publicPath || 'auto' === publicPath) return;
37
+ (_config = config).module || (_config.module = {});
38
+ const moduleConfig = config.module;
39
+ (_moduleConfig = moduleConfig).generator || (_moduleConfig.generator = {});
40
+ for (const moduleType of STATIC_ASSET_MODULE_TYPES){
41
+ var _moduleConfig_generator, _moduleType, _moduleConfig_generator_moduleType;
42
+ (_moduleConfig_generator = moduleConfig.generator)[_moduleType = moduleType] || (_moduleConfig_generator[_moduleType] = {});
43
+ null != (_moduleConfig_generator_moduleType = moduleConfig.generator[moduleType]).publicPath || (_moduleConfig_generator_moduleType.publicPath = publicPath);
44
+ }
45
+ };
30
46
  const mfSSRRsbuildPlugin = (pluginOptions)=>({
31
47
  name: '@modern-js/plugin-mf-post-config',
32
48
  pre: [
@@ -82,7 +98,9 @@ const mfSSRRsbuildPlugin = (pluginOptions)=>({
82
98
  if (ssrEnv !== utils.environment.name) return config;
83
99
  const userSSRConfig = pluginOptions.userConfig.ssr ? 'object' == typeof pluginOptions.userConfig.ssr ? pluginOptions.userConfig.ssr : {} : {};
84
100
  if (!userSSRConfig.distOutputDir) return;
85
- config.output.publicPath = `${config.output.publicPath}${path.relative(csrOutputPath, ssrOutputPath)}/`;
101
+ const publicPath = config.output.publicPath;
102
+ preserveStaticAssetPublicPath(config, publicPath);
103
+ config.output.publicPath = `${publicPath}${path.relative(csrOutputPath, ssrOutputPath)}/`;
86
104
  return config;
87
105
  };
88
106
  api.modifyRspackConfig((config, utils)=>{
package/dist/types/cli/ssrPlugin.spec.d.ts ADDED
@@ -0,0 +1 @@
1
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@module-federation/modern-js-v3",
3
- "version": "2.5.1",
3
+ "version": "2.6.0",
4
4
  "files": [
5
5
  "dist/",
6
6
  "types.d.ts",
@@ -137,18 +137,19 @@
137
137
  "node-fetch": "3.3.0",
138
138
  "jiti": "2.4.2",
139
139
  "react-error-boundary": "4.1.2",
140
- "@module-federation/rsbuild-plugin": "2.5.1",
141
- "@module-federation/bridge-react": "2.5.1",
142
- "@module-federation/runtime": "2.5.1",
143
- "@module-federation/enhanced": "2.5.1",
144
- "@module-federation/node": "2.7.44",
145
- "@module-federation/sdk": "2.5.1",
146
- "@module-federation/cli": "2.5.1"
140
+ "@module-federation/rsbuild-plugin": "2.6.0",
141
+ "@module-federation/enhanced": "2.6.0",
142
+ "@module-federation/runtime": "2.6.0",
143
+ "@module-federation/bridge-react": "2.6.0",
144
+ "@module-federation/node": "2.7.45",
145
+ "@module-federation/sdk": "2.6.0",
146
+ "@module-federation/cli": "2.6.0"
147
147
  },
148
148
  "devDependencies": {
149
149
  "@rsbuild/plugin-react": "1.4.5",
150
150
  "@rslib/core": "0.18.5",
151
151
  "@rsbuild/core": "2.0.0-beta.2",
152
+ "@rspack/core": "2.0.6",
152
153
  "@modern-js/app-tools": "3.0.1",
153
154
  "@modern-js/server-runtime": "3.0.1",
154
155
  "@modern-js/module-tools": "2.70.5",
@@ -159,7 +160,7 @@
159
160
  "react": "~18.3.1",
160
161
  "react-dom": "~18.3.1",
161
162
  "vitest": "1.6.0",
162
- "@module-federation/manifest": "2.5.1"
163
+ "@module-federation/manifest": "2.6.0"
163
164
  },
164
165
  "peerDependencies": {
165
166
  "react": ">=17",