@module-federation/modern-js 0.0.0-next-20240910102933 → 0.0.0-next-20240911025149

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 (94) hide show
  1. package/dist/cjs/cli/{dataLoader/ast/index.js → constant.js} +6 -6
  2. package/dist/cjs/cli/index.js +1 -5
  3. package/dist/cjs/cli/mfRuntimePlugins/{node-fetch.js → inject-node-fetch.js} +6 -6
  4. package/dist/cjs/cli/mfRuntimePlugins/resolve-entry-ipv4.js +38 -40
  5. package/dist/cjs/{runtime/withMFRouteId.js → cli/mfRuntimePlugins/shared-strategy.js} +23 -11
  6. package/dist/cjs/cli/ssrPlugin.js +1 -1
  7. package/dist/cjs/cli/utils.js +6 -11
  8. package/dist/cjs/cli/utils.spec.js +6 -5
  9. package/dist/cjs/constant.js +2 -32
  10. package/dist/cjs/runtime/index.js +1 -4
  11. package/dist/cjs/ssr-runtime/plugin.js +7 -7
  12. package/dist/esm/cli/constant.js +4 -0
  13. package/dist/esm/cli/index.js +1 -4
  14. package/dist/esm/cli/mfRuntimePlugins/{node-fetch.js → inject-node-fetch.js} +3 -3
  15. package/dist/esm/cli/mfRuntimePlugins/shared-strategy.js +25 -0
  16. package/dist/esm/cli/ssrPlugin.js +1 -1
  17. package/dist/esm/cli/utils.js +5 -9
  18. package/dist/esm/cli/utils.spec.js +6 -5
  19. package/dist/esm/constant.js +1 -21
  20. package/dist/esm/runtime/index.js +1 -3
  21. package/dist/esm/ssr-runtime/plugin.js +10 -7
  22. package/dist/esm-node/cli/constant.js +4 -0
  23. package/dist/esm-node/cli/index.js +1 -5
  24. package/dist/esm-node/cli/mfRuntimePlugins/{node-fetch.js → inject-node-fetch.js} +3 -3
  25. package/dist/esm-node/cli/mfRuntimePlugins/resolve-entry-ipv4.js +38 -40
  26. package/dist/esm-node/cli/mfRuntimePlugins/shared-strategy.js +23 -0
  27. package/dist/esm-node/cli/ssrPlugin.js +1 -1
  28. package/dist/esm-node/cli/utils.js +5 -9
  29. package/dist/esm-node/cli/utils.spec.js +6 -5
  30. package/dist/esm-node/constant.js +1 -21
  31. package/dist/esm-node/runtime/index.js +1 -3
  32. package/dist/esm-node/ssr-runtime/plugin.js +7 -7
  33. package/dist/types/cli/constant.d.ts +1 -0
  34. package/dist/types/cli/mfRuntimePlugins/shared-strategy.d.ts +3 -0
  35. package/dist/types/cli/utils.d.ts +0 -2
  36. package/dist/types/constant.d.ts +0 -10
  37. package/dist/types/runtime/index.d.ts +0 -1
  38. package/dist/types/types/index.d.ts +0 -9
  39. package/package.json +11 -48
  40. package/dist/cjs/cli/dataLoader/ast/constant.js +0 -49
  41. package/dist/cjs/cli/dataLoader/ast/generateRoutes.js +0 -141
  42. package/dist/cjs/cli/dataLoader/generateRouteFile.js +0 -143
  43. package/dist/cjs/cli/dataLoader/patchMFConfig.js +0 -140
  44. package/dist/cjs/cli/dataLoader/plugin.js +0 -199
  45. package/dist/cjs/cli/mfRuntimePlugins/node.js +0 -41
  46. package/dist/cjs/cli/server/dataLoaderPlugin.js +0 -82
  47. package/dist/cjs/cli/server/fetchRemoteFullRoutesMap.js +0 -69
  48. package/dist/cjs/interfaces/route.js +0 -16
  49. package/dist/cjs/runtime/dataLoader/plugin-inject-assets.js +0 -84
  50. package/dist/cjs/runtime/dataLoader/plugin.js +0 -74
  51. package/dist/cjs/runtime/dataLoader/utils.js +0 -106
  52. package/dist/esm/cli/dataLoader/ast/constant.js +0 -18
  53. package/dist/esm/cli/dataLoader/ast/generateRoutes.js +0 -108
  54. package/dist/esm/cli/dataLoader/ast/index.js +0 -4
  55. package/dist/esm/cli/dataLoader/generateRouteFile.js +0 -293
  56. package/dist/esm/cli/dataLoader/patchMFConfig.js +0 -106
  57. package/dist/esm/cli/dataLoader/plugin.js +0 -214
  58. package/dist/esm/cli/mfRuntimePlugins/node.js +0 -13
  59. package/dist/esm/cli/server/dataLoaderPlugin.js +0 -105
  60. package/dist/esm/cli/server/fetchRemoteFullRoutesMap.js +0 -88
  61. package/dist/esm/interfaces/route.js +0 -0
  62. package/dist/esm/runtime/dataLoader/plugin-inject-assets.js +0 -63
  63. package/dist/esm/runtime/dataLoader/plugin.js +0 -93
  64. package/dist/esm/runtime/dataLoader/utils.js +0 -77
  65. package/dist/esm/runtime/withMFRouteId.js +0 -7
  66. package/dist/esm-node/cli/dataLoader/ast/constant.js +0 -18
  67. package/dist/esm-node/cli/dataLoader/ast/generateRoutes.js +0 -107
  68. package/dist/esm-node/cli/dataLoader/ast/index.js +0 -4
  69. package/dist/esm-node/cli/dataLoader/generateRouteFile.js +0 -108
  70. package/dist/esm-node/cli/dataLoader/patchMFConfig.js +0 -106
  71. package/dist/esm-node/cli/dataLoader/plugin.js +0 -164
  72. package/dist/esm-node/cli/mfRuntimePlugins/node.js +0 -11
  73. package/dist/esm-node/cli/server/dataLoaderPlugin.js +0 -62
  74. package/dist/esm-node/cli/server/fetchRemoteFullRoutesMap.js +0 -44
  75. package/dist/esm-node/interfaces/route.js +0 -0
  76. package/dist/esm-node/runtime/dataLoader/plugin-inject-assets.js +0 -60
  77. package/dist/esm-node/runtime/dataLoader/plugin.js +0 -50
  78. package/dist/esm-node/runtime/dataLoader/utils.js +0 -77
  79. package/dist/esm-node/runtime/withMFRouteId.js +0 -7
  80. package/dist/types/cli/dataLoader/ast/constant.d.ts +0 -8
  81. package/dist/types/cli/dataLoader/ast/generateRoutes.d.ts +0 -5
  82. package/dist/types/cli/dataLoader/ast/index.d.ts +0 -1
  83. package/dist/types/cli/dataLoader/generateRouteFile.d.ts +0 -7
  84. package/dist/types/cli/dataLoader/patchMFConfig.d.ts +0 -10
  85. package/dist/types/cli/dataLoader/plugin.d.ts +0 -6
  86. package/dist/types/cli/mfRuntimePlugins/node.d.ts +0 -3
  87. package/dist/types/cli/server/dataLoaderPlugin.d.ts +0 -10
  88. package/dist/types/cli/server/fetchRemoteFullRoutesMap.d.ts +0 -10
  89. package/dist/types/interfaces/route.d.ts +0 -12
  90. package/dist/types/runtime/dataLoader/plugin-inject-assets.d.ts +0 -2
  91. package/dist/types/runtime/dataLoader/plugin.d.ts +0 -2
  92. package/dist/types/runtime/dataLoader/utils.d.ts +0 -22
  93. package/dist/types/runtime/withMFRouteId.d.ts +0 -1
  94. /package/dist/types/cli/mfRuntimePlugins/{node-fetch.d.ts → inject-node-fetch.d.ts} +0 -0
@@ -1,6 +1,6 @@
1
1
  import nodeFetch from "node-fetch";
2
2
  const injectNodeFetchPlugin = () => ({
3
- name: "node-fetch-plugin",
3
+ name: "inject-node-fetch-plugin",
4
4
  beforeInit(args) {
5
5
  if (!globalThis.fetch) {
6
6
  globalThis.fetch = nodeFetch;
@@ -8,7 +8,7 @@ const injectNodeFetchPlugin = () => ({
8
8
  return args;
9
9
  }
10
10
  });
11
- var node_fetch_default = injectNodeFetchPlugin;
11
+ var inject_node_fetch_default = injectNodeFetchPlugin;
12
12
  export {
13
- node_fetch_default as default
13
+ inject_node_fetch_default as default
14
14
  };
@@ -16,48 +16,46 @@ function replaceObjectLocalhost(key, obj) {
16
16
  function replaceLocalhost(url) {
17
17
  return url.replace(LOCALHOST, ipv4);
18
18
  }
19
- const resolveEntryIpv4Plugin = () => {
20
- return {
21
- name: "resolve-entry-ipv4",
22
- beforeRegisterRemote(args) {
23
- const { remote } = args;
24
- replaceObjectLocalhost("entry", remote);
25
- return args;
26
- },
27
- async afterResolve(args) {
28
- const { remoteInfo } = args;
29
- replaceObjectLocalhost("entry", remoteInfo);
30
- return args;
31
- },
32
- beforeLoadRemoteSnapshot(args) {
33
- const { moduleInfo } = args;
34
- if ("entry" in moduleInfo) {
35
- replaceObjectLocalhost("entry", moduleInfo);
36
- return args;
37
- }
38
- if ("version" in moduleInfo) {
39
- replaceObjectLocalhost("version", moduleInfo);
40
- }
41
- return args;
42
- },
43
- loadRemoteSnapshot(args) {
44
- const { remoteSnapshot } = args;
45
- if ("publicPath" in remoteSnapshot) {
46
- replaceObjectLocalhost("publicPath", remoteSnapshot);
47
- }
48
- if ("getPublicPath" in remoteSnapshot) {
49
- replaceObjectLocalhost("getPublicPath", remoteSnapshot);
50
- }
51
- if (remoteSnapshot.remotesInfo) {
52
- Object.keys(remoteSnapshot.remotesInfo).forEach((key) => {
53
- const remoteInfo = remoteSnapshot.remotesInfo[key];
54
- replaceObjectLocalhost("matchedVersion", remoteInfo);
55
- });
56
- }
19
+ const resolveEntryIpv4Plugin = () => ({
20
+ name: "resolve-entry-ipv4",
21
+ beforeRegisterRemote(args) {
22
+ const { remote } = args;
23
+ replaceObjectLocalhost("entry", remote);
24
+ return args;
25
+ },
26
+ async afterResolve(args) {
27
+ const { remoteInfo } = args;
28
+ replaceObjectLocalhost("entry", remoteInfo);
29
+ return args;
30
+ },
31
+ beforeLoadRemoteSnapshot(args) {
32
+ const { moduleInfo } = args;
33
+ if ("entry" in moduleInfo) {
34
+ replaceObjectLocalhost("entry", moduleInfo);
57
35
  return args;
58
36
  }
59
- };
60
- };
37
+ if ("version" in moduleInfo) {
38
+ replaceObjectLocalhost("version", moduleInfo);
39
+ }
40
+ return args;
41
+ },
42
+ loadRemoteSnapshot(args) {
43
+ const { remoteSnapshot } = args;
44
+ if ("publicPath" in remoteSnapshot) {
45
+ replaceObjectLocalhost("publicPath", remoteSnapshot);
46
+ }
47
+ if ("getPublicPath" in remoteSnapshot) {
48
+ replaceObjectLocalhost("getPublicPath", remoteSnapshot);
49
+ }
50
+ if (remoteSnapshot.remotesInfo) {
51
+ Object.keys(remoteSnapshot.remotesInfo).forEach((key) => {
52
+ const remoteInfo = remoteSnapshot.remotesInfo[key];
53
+ replaceObjectLocalhost("matchedVersion", remoteInfo);
54
+ });
55
+ }
56
+ return args;
57
+ }
58
+ });
61
59
  var resolve_entry_ipv4_default = resolveEntryIpv4Plugin;
62
60
  export {
63
61
  resolve_entry_ipv4_default as default
@@ -0,0 +1,23 @@
1
+ const sharedStrategy = () => ({
2
+ name: "shared-strategy-plugin",
3
+ beforeInit(args) {
4
+ const { userOptions } = args;
5
+ const shared = userOptions.shared;
6
+ if (shared) {
7
+ Object.keys(shared).forEach((sharedKey) => {
8
+ const sharedConfigs = shared[sharedKey];
9
+ const arraySharedConfigs = Array.isArray(sharedConfigs) ? sharedConfigs : [
10
+ sharedConfigs
11
+ ];
12
+ arraySharedConfigs.forEach((s) => {
13
+ s.strategy = "loaded-first";
14
+ });
15
+ });
16
+ }
17
+ return args;
18
+ }
19
+ });
20
+ var shared_strategy_default = sharedStrategy;
21
+ export {
22
+ shared_strategy_default as default
23
+ };
@@ -4,7 +4,7 @@ import { ModuleFederationPlugin } from "@module-federation/enhanced/webpack";
4
4
  import { ModuleFederationPlugin as RspackModuleFederationPlugin } from "@module-federation/enhanced/rspack";
5
5
  import UniverseEntryChunkTrackerPlugin from "@module-federation/node/universe-entry-chunk-tracker-plugin";
6
6
  import { updateStatsAndManifest } from "./manifest";
7
- import { isDev } from "../constant";
7
+ import { isDev } from "./constant";
8
8
  function setEnv() {
9
9
  process.env["MF_DISABLE_EMIT_STATS"] = "true";
10
10
  process.env["MF_SSR_PRJ"] = "true";
@@ -47,9 +47,7 @@ const replaceRemoteUrl = (mfConfig, remoteIpStrategy) => {
47
47
  if (typeof remoteObject === "string") {
48
48
  return;
49
49
  }
50
- if ("entry" in remoteObject && typeof remoteObject.entry === "string") {
51
- remoteObject.entry = remoteObject.entry.replace(LOCALHOST, ipv4);
52
- }
50
+ handleRemoteObject(remoteObject);
53
51
  });
54
52
  } else if (typeof mfConfig.remotes !== "string") {
55
53
  handleRemoteObject(mfConfig.remotes);
@@ -98,18 +96,17 @@ const patchMFConfig = (mfConfig, isServer, remoteIpStrategy) => {
98
96
  const runtimePlugins = [
99
97
  ...mfConfig.runtimePlugins || []
100
98
  ];
101
- var _mfConfig_shareStrategy;
102
- mfConfig.shareStrategy = (_mfConfig_shareStrategy = mfConfig.shareStrategy) !== null && _mfConfig_shareStrategy !== void 0 ? _mfConfig_shareStrategy : "loaded-first";
103
99
  patchDTSConfig(mfConfig, isServer);
100
+ injectRuntimePlugins(path.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js"), runtimePlugins);
104
101
  if (isDev) {
105
102
  injectRuntimePlugins(path.resolve(__dirname, "./mfRuntimePlugins/resolve-entry-ipv4.js"), runtimePlugins);
106
103
  }
107
104
  if (isServer) {
108
- injectRuntimePlugins(path.resolve(__dirname, "./mfRuntimePlugins/node.js"), runtimePlugins);
105
+ injectRuntimePlugins(require.resolve("@module-federation/node/runtimePlugin"), runtimePlugins);
109
106
  if (isDev) {
110
107
  injectRuntimePlugins(require.resolve("@module-federation/node/record-dynamic-remote-entry-hash-plugin"), runtimePlugins);
111
108
  }
112
- injectRuntimePlugins(path.resolve(__dirname, "./mfRuntimePlugins/node-fetch.js"), runtimePlugins);
109
+ injectRuntimePlugins(path.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js"), runtimePlugins);
113
110
  if (!mfConfig.library) {
114
111
  mfConfig.library = {
115
112
  type: "commonjs-module",
@@ -294,6 +291,5 @@ export {
294
291
  getMFConfig,
295
292
  patchBundlerConfig,
296
293
  patchIgnoreWarning,
297
- patchMFConfig,
298
- replaceRemoteUrl
294
+ patchMFConfig
299
295
  };
@@ -36,10 +36,10 @@ describe("patchMFConfig", async () => {
36
36
  remote: `http://${ipv4}:3000/remoteEntry.js`
37
37
  },
38
38
  remoteType: "script",
39
- shareStrategy: "loaded-first",
40
39
  runtimePlugins: [
41
- path.resolve(__dirname, "./mfRuntimePlugins/node.js"),
42
- path.resolve(__dirname, "./mfRuntimePlugins/node-fetch.js")
40
+ path.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js"),
41
+ require.resolve("@module-federation/node/runtimePlugin"),
42
+ path.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js")
43
43
  ],
44
44
  shared: {
45
45
  react: {
@@ -64,8 +64,9 @@ describe("patchMFConfig", async () => {
64
64
  remote: `http://${ipv4}:3000/remoteEntry.js`
65
65
  },
66
66
  remoteType: "script",
67
- runtimePlugins: [],
68
- shareStrategy: "loaded-first",
67
+ runtimePlugins: [
68
+ path.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js")
69
+ ],
69
70
  shared: {
70
71
  react: {
71
72
  eager: true,
@@ -1,28 +1,8 @@
1
1
  const MODERN_JS_SERVER_DIR = "bundles";
2
2
  const LOCALHOST = "localhost";
3
3
  const PLUGIN_IDENTIFIER = "[ Modern.js Module Federation ]";
4
- const isDev = process.env.NODE_ENV === "development";
5
- const MODERN_JS_FILE_SYSTEM_ROUTES_FILE_NAME = "routes";
6
- const MODERN_JS_ROUTE_SERVER_LOADER = "route-server-loaders";
7
- const META_NAME = "modern-js";
8
- const FOLD_IDENTIFIER = "@mf";
9
- const SEPARATOR = "_";
10
- const MF_ROUTES = "mf-routes";
11
- const DEFAULT_ENTRY = "main";
12
- const DEFAULT_LAYOUT = "layout";
13
- const MF_JSON = "mf.json";
14
4
  export {
15
- DEFAULT_ENTRY,
16
- DEFAULT_LAYOUT,
17
- FOLD_IDENTIFIER,
18
5
  LOCALHOST,
19
- META_NAME,
20
- MF_JSON,
21
- MF_ROUTES,
22
- MODERN_JS_FILE_SYSTEM_ROUTES_FILE_NAME,
23
- MODERN_JS_ROUTE_SERVER_LOADER,
24
6
  MODERN_JS_SERVER_DIR,
25
- PLUGIN_IDENTIFIER,
26
- SEPARATOR,
27
- isDev
7
+ PLUGIN_IDENTIFIER
28
8
  };
@@ -1,7 +1,5 @@
1
1
  export * from "@module-federation/enhanced/runtime";
2
2
  import { createRemoteSSRComponent } from "./createRemoteSSRComponent";
3
- import { withMFRouteId } from "./withMFRouteId";
4
3
  export {
5
- createRemoteSSRComponent,
6
- withMFRouteId
4
+ createRemoteSSRComponent
7
5
  };
@@ -1,17 +1,15 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
2
2
  import hoistNonReactStatics from "hoist-non-react-statics";
3
3
  import { SSRLiveReload } from "./SSRLiveReload";
4
- console.log("mfSSRPlugin trigger");
5
4
  const mfSSRPlugin = () => ({
6
5
  name: "@module-federation/modern-js",
7
- pre: [
8
- "@modern-js/plugin-router"
9
- ],
10
6
  setup: () => {
11
7
  return {
12
- async beforeRender() {
8
+ async init({ context }, next) {
13
9
  if (typeof window !== "undefined") {
14
- return;
10
+ return next({
11
+ context
12
+ });
15
13
  }
16
14
  globalThis.shouldUpdate = false;
17
15
  const nodeUtils = await import("@module-federation/node/utils");
@@ -21,7 +19,9 @@ const mfSSRPlugin = () => ({
21
19
  await nodeUtils.flushChunks();
22
20
  globalThis.shouldUpdate = true;
23
21
  }
24
- return;
22
+ return next({
23
+ context
24
+ });
25
25
  },
26
26
  wrapRoot(App) {
27
27
  const AppWrapper = (props) => /* @__PURE__ */ _jsxs(_Fragment, {
@@ -0,0 +1 @@
1
+ export declare const isDev: boolean;
@@ -0,0 +1,3 @@
1
+ import type { FederationRuntimePlugin } from '@module-federation/enhanced/runtime';
2
+ declare const sharedStrategy: () => FederationRuntimePlugin;
3
+ export default sharedStrategy;
@@ -2,10 +2,8 @@ import type { webpack, UserConfig, AppTools, Rspack, Bundler } from '@modern-js/
2
2
  import { moduleFederationPlugin } from '@module-federation/sdk';
3
3
  import { PluginOptions } from '../types';
4
4
  import { BundlerConfig } from '../interfaces/bundler';
5
- import type { init } from '@module-federation/enhanced/runtime';
6
5
  export type ConfigType<T> = T extends 'webpack' ? webpack.Configuration : T extends 'rspack' ? Rspack.Configuration : never;
7
6
  export declare const getMFConfig: (userConfig: PluginOptions) => Promise<moduleFederationPlugin.ModuleFederationPluginOptions>;
8
- export declare const replaceRemoteUrl: (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions | Parameters<typeof init>[0], remoteIpStrategy?: "ipv4" | "inherit") => void;
9
7
  export declare const patchMFConfig: (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions, isServer: boolean, remoteIpStrategy?: "ipv4" | "inherit") => moduleFederationPlugin.ModuleFederationPluginOptions;
10
8
  export declare function patchIgnoreWarning<T extends Bundler>(bundlerConfig: BundlerConfig<T>): void;
11
9
  export declare function patchBundlerConfig<T extends Bundler>(options: {
@@ -1,13 +1,3 @@
1
1
  export declare const MODERN_JS_SERVER_DIR = "bundles";
2
2
  export declare const LOCALHOST = "localhost";
3
3
  export declare const PLUGIN_IDENTIFIER = "[ Modern.js Module Federation ]";
4
- export declare const isDev: boolean;
5
- export declare const MODERN_JS_FILE_SYSTEM_ROUTES_FILE_NAME = "routes";
6
- export declare const MODERN_JS_ROUTE_SERVER_LOADER = "route-server-loaders";
7
- export declare const META_NAME = "modern-js";
8
- export declare const FOLD_IDENTIFIER = "@mf";
9
- export declare const SEPARATOR = "_";
10
- export declare const MF_ROUTES = "mf-routes";
11
- export declare const DEFAULT_ENTRY = "main";
12
- export declare const DEFAULT_LAYOUT = "layout";
13
- export declare const MF_JSON = "mf.json";
@@ -1,3 +1,2 @@
1
1
  export * from '@module-federation/enhanced/runtime';
2
2
  export { createRemoteSSRComponent } from './createRemoteSSRComponent';
3
- export { withMFRouteId } from './withMFRouteId';
@@ -1,12 +1,10 @@
1
1
  import { moduleFederationPlugin } from '@module-federation/sdk';
2
2
  import type { ModuleFederationPlugin as WebpackModuleFederationPlugin } from '@module-federation/enhanced';
3
3
  import type { ModuleFederationPlugin as RspackModuleFederationPlugin } from '@module-federation/enhanced/rspack';
4
- import type { init } from '@module-federation/enhanced/runtime';
5
4
  export interface PluginOptions {
6
5
  config?: moduleFederationPlugin.ModuleFederationPluginOptions;
7
6
  configPath?: string;
8
7
  remoteIpStrategy?: 'ipv4' | 'inherit';
9
- dataLoader?: boolean | DataLoaderOptions;
10
8
  }
11
9
  export interface InternalModernPluginOptions {
12
10
  csrConfig?: moduleFederationPlugin.ModuleFederationPluginOptions;
@@ -18,10 +16,3 @@ export interface InternalModernPluginOptions {
18
16
  remoteIpStrategy?: 'ipv4' | 'inherit';
19
17
  }
20
18
  export type BundlerPlugin = WebpackModuleFederationPlugin | RspackModuleFederationPlugin;
21
- export type TransformRuntimeOptions = (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions) => Parameters<typeof init>[0];
22
- export type DataLoaderOptions = {
23
- partialSSRRemotes?: string[];
24
- metaName?: string;
25
- serverPlugin?: string;
26
- transformRuntimeOptions?: TransformRuntimeOptions;
27
- };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@module-federation/modern-js",
3
- "version": "0.0.0-next-20240910102933",
3
+ "version": "0.0.0-next-20240911025149",
4
4
  "files": [
5
5
  "dist/",
6
6
  "types.d.ts",
@@ -23,23 +23,6 @@
23
23
  "types": "./dist/types/ssr-runtime/index.d.ts",
24
24
  "default": "./dist/esm/ssr-runtime/index.js"
25
25
  },
26
- "./data-loader": {
27
- "types": "./dist/types/runtime/dataLoader/plugin.d.ts",
28
- "default": "./dist/esm/runtime/dataLoader/plugin.js"
29
- },
30
- "./data-loader-inject-assets": {
31
- "types": "./dist/types/runtime/dataLoader/plugin-inject-assets.d.ts",
32
- "default": "./dist/esm/runtime/dataLoader/plugin-inject-assets.js"
33
- },
34
- "./data-loader-server": {
35
- "types": "./dist/types/cli/server/dataLoaderPlugin.d.ts",
36
- "default": "./dist/cjs/cli/server/dataLoaderPlugin.js"
37
- },
38
- "./data-loader-plugin": {
39
- "import": "./dist/esm/cli/dataLoader/plugin.js",
40
- "require": "./dist/cjs/cli/dataLoader/plugin.js",
41
- "types": "./dist/types/cli/dataLoader/plugin.d.ts"
42
- },
43
26
  "./config-plugin": {
44
27
  "import": "./dist/esm/cli/configPlugin.js",
45
28
  "require": "./dist/cjs/cli/configPlugin.js",
@@ -64,18 +47,6 @@
64
47
  ],
65
48
  "ssr-plugin": [
66
49
  "./dist/types/cli/ssrPlugin.d.ts"
67
- ],
68
- "data-loader-plugin": [
69
- "./dist/types/cli/dataLoader/plugin.d.ts"
70
- ],
71
- "data-loader": [
72
- "./dist/types/runtime/dataLoader/plugin.d.ts"
73
- ],
74
- "data-loader-inject-assets": [
75
- "./dist/types/runtime/dataLoader/plugin-inject-assets.d.ts"
76
- ],
77
- "data-loader-server": [
78
- "./dist/types/cli/server/dataLoaderPlugin.d.ts"
79
50
  ]
80
51
  }
81
52
  },
@@ -85,33 +56,25 @@
85
56
  "license": "MIT",
86
57
  "dependencies": {
87
58
  "@swc/helpers": "0.5.12",
88
- "@modern-js/utils": "2.58.4-alpha.2",
59
+ "@modern-js/utils": "2.54.2",
89
60
  "@modern-js/node-bundle-require": "2.54.2",
90
61
  "node-fetch": "~3.3.0",
91
62
  "react-error-boundary": "4.0.13",
92
63
  "hoist-non-react-statics": "3.3.2",
93
- "@babel/generator": "7.25.0",
94
- "@babel/parser": "7.25.3",
95
- "@babel/traverse": "7.25.3",
96
- "@babel/types": "7.25.2",
97
- "@module-federation/sdk": "0.0.0-next-20240910102933",
98
- "@module-federation/enhanced": "0.0.0-next-20240910102933",
99
- "@module-federation/node": "0.0.0-next-20240910102933"
64
+ "@module-federation/sdk": "0.0.0-next-20240911025149",
65
+ "@module-federation/enhanced": "0.0.0-next-20240911025149",
66
+ "@module-federation/node": "0.0.0-next-20240911025149"
100
67
  },
101
68
  "devDependencies": {
102
- "@types/babel__traverse": "7.20.6",
103
- "@types/babel__generator": "7.6.8",
104
69
  "@types/hoist-non-react-statics": "3.3.2",
105
- "@modern-js/server-core": "^2.59.0",
106
- "@modern-js/app-tools": "^2.59.0",
107
- "@modern-js/core": "^2.59.0",
108
- "@modern-js/runtime": "^2.59.0",
109
- "@modern-js/module-tools": "^2.59.0",
110
- "@modern-js/tsconfig": "^2.59.0",
111
- "@module-federation/manifest": "0.0.0-next-20240910102933"
70
+ "@modern-js/app-tools": "2.57.0",
71
+ "@modern-js/core": "2.57.0",
72
+ "@modern-js/runtime": "2.57.0",
73
+ "@modern-js/module-tools": "2.57.0",
74
+ "@modern-js/tsconfig": "2.57.0",
75
+ "@module-federation/manifest": "0.0.0-next-20240911025149"
112
76
  },
113
77
  "peerDependencies": {
114
- "@modern-js/runtime": "^2.59.0",
115
78
  "react": ">=17",
116
79
  "react-dom": ">=17",
117
80
  "typescript": "^4.9.0 || ^5.0.0",
@@ -1,49 +0,0 @@
1
- "use strict";
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __hasOwnProp = Object.prototype.hasOwnProperty;
6
- var __export = (target, all) => {
7
- for (var name in all)
8
- __defProp(target, name, { get: all[name], enumerable: true });
9
- };
10
- var __copyProps = (to, from, except, desc) => {
11
- if (from && typeof from === "object" || typeof from === "function") {
12
- for (let key of __getOwnPropNames(from))
13
- if (!__hasOwnProp.call(to, key) && key !== except)
14
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
- }
16
- return to;
17
- };
18
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
- var constant_exports = {};
20
- __export(constant_exports, {
21
- COMPONENT: () => COMPONENT,
22
- ELEMENT: () => ELEMENT,
23
- ID: () => ID,
24
- IS_ROOT: () => IS_ROOT,
25
- LAZY_COMPONENT: () => LAZY_COMPONENT,
26
- LOADER: () => LOADER,
27
- PRIVATE_COMPONENT: () => PRIVATE_COMPONENT,
28
- SHOULD_REVALIDATE: () => SHOULD_REVALIDATE
29
- });
30
- module.exports = __toCommonJS(constant_exports);
31
- const IS_ROOT = "isRoot";
32
- const ID = "id";
33
- const COMPONENT = "component";
34
- const LAZY_COMPONENT = "lazyImport";
35
- const SHOULD_REVALIDATE = "shouldRevalidate";
36
- const PRIVATE_COMPONENT = "_component";
37
- const ELEMENT = "element";
38
- const LOADER = "loader";
39
- // Annotate the CommonJS export names for ESM import in node:
40
- 0 && (module.exports = {
41
- COMPONENT,
42
- ELEMENT,
43
- ID,
44
- IS_ROOT,
45
- LAZY_COMPONENT,
46
- LOADER,
47
- PRIVATE_COMPONENT,
48
- SHOULD_REVALIDATE
49
- });
@@ -1,141 +0,0 @@
1
- "use strict";
2
- var __create = Object.create;
3
- var __defProp = Object.defineProperty;
4
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
- var __getOwnPropNames = Object.getOwnPropertyNames;
6
- var __getProtoOf = Object.getPrototypeOf;
7
- var __hasOwnProp = Object.prototype.hasOwnProperty;
8
- var __export = (target, all) => {
9
- for (var name in all)
10
- __defProp(target, name, { get: all[name], enumerable: true });
11
- };
12
- var __copyProps = (to, from, except, desc) => {
13
- if (from && typeof from === "object" || typeof from === "function") {
14
- for (let key of __getOwnPropNames(from))
15
- if (!__hasOwnProp.call(to, key) && key !== except)
16
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
17
- }
18
- return to;
19
- };
20
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
- // If the importer is in node compatibility mode or this is not an ESM
22
- // file that has been converted to a CommonJS file using a Babel-
23
- // compatible transform (i.e. "__esModule" has not been set), then set
24
- // "default" to the CommonJS "module.exports" for node compatibility.
25
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
26
- mod
27
- ));
28
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
- var generateRoutes_exports = {};
30
- __export(generateRoutes_exports, {
31
- generateRoutes: () => generateRoutes
32
- });
33
- module.exports = __toCommonJS(generateRoutes_exports);
34
- var import_fs = __toESM(require("fs"));
35
- var import_traverse = __toESM(require("@babel/traverse"));
36
- var babelParser = __toESM(require("@babel/parser"));
37
- var import_generator = __toESM(require("@babel/generator"));
38
- var t = __toESM(require("@babel/types"));
39
- function findTargetKeyNode(nodeProperties, key) {
40
- return nodeProperties.find((p) => t.isObjectProperty(p) && t.isStringLiteral(p.key) && p.key.value === key);
41
- }
42
- function generateRoutes({ sourceCode, filePath }) {
43
- const ast = babelParser.parse(sourceCode, {
44
- sourceType: "module"
45
- });
46
- const lazyComponentDeclarations = [];
47
- const componentDeclarations = [];
48
- let componentId = 0;
49
- (0, import_traverse.default)(ast, {
50
- // ImportDeclaration(path) {
51
- // const source = path.node.source.value;
52
- // const routeIdMatch = source.match(/routeId=([^&]+)/);
53
- // if (routeIdMatch) {
54
- // const originalRouteId = routeIdMatch[1];
55
- // const newRouteId = `${prefix}${originalRouteId}`;
56
- // const newSource = source.replace(
57
- // /routeId=[^&]+/,
58
- // `routeId=${newRouteId}`,
59
- // );
60
- // path.node.source = t.stringLiteral(newSource);
61
- // }
62
- // },
63
- ObjectExpression(path) {
64
- let componentName = "";
65
- let lazyComponentName = "";
66
- if (!Array.isArray(path.node.properties)) {
67
- return;
68
- }
69
- const idNode = findTargetKeyNode(path.node.properties, "id");
70
- if (idNode && t.isObjectProperty(idNode) && t.isStringLiteral(idNode.value)) {
71
- }
72
- const isRootNode = findTargetKeyNode(path.node.properties, "isRoot");
73
- if (isRootNode && t.isObjectProperty(isRootNode) && t.isBooleanLiteral(isRootNode.value)) {
74
- isRootNode.value.value = false;
75
- }
76
- if (!isRootNode) {
77
- const lazyComponentNode = findTargetKeyNode(path.node.properties, "lazyImport");
78
- if (lazyComponentNode && t.isObjectProperty(lazyComponentNode) && t.isArrowFunctionExpression(lazyComponentNode.value)) {
79
- lazyComponentName = `LazyComponent_${componentId}`;
80
- const lazyDeclaration = t.variableDeclaration("const", [
81
- t.variableDeclarator(t.identifier(lazyComponentName), lazyComponentNode.value)
82
- ]);
83
- lazyComponentNode.value = t.identifier(lazyComponentName);
84
- const componentNode2 = findTargetKeyNode(path.node.properties, "component");
85
- if (componentNode2 && t.isObjectProperty(componentNode2) && t.isCallExpression(componentNode2.value) && t.isIdentifier(componentNode2.value.callee)) {
86
- componentNode2.value = t.callExpression(t.identifier("lazy"), [
87
- t.identifier(lazyComponentName)
88
- ]);
89
- }
90
- lazyComponentDeclarations.push(lazyDeclaration);
91
- }
92
- }
93
- const componentNode = findTargetKeyNode(path.node.properties, "component");
94
- if (componentNode && t.isObjectProperty(componentNode) && t.isCallExpression(componentNode.value) && t.isIdentifier(componentNode.value.callee)) {
95
- componentName = `Component_${componentId}`;
96
- const componentDeclaration = t.variableDeclaration("const", [
97
- t.variableDeclarator(t.identifier(componentName), lazyComponentName ? t.callExpression(t.identifier("lazy"), [
98
- t.identifier(lazyComponentName)
99
- ]) : componentNode.value)
100
- ]);
101
- componentDeclarations.push(componentDeclaration);
102
- componentNode.value = t.identifier(componentName);
103
- }
104
- if (lazyComponentName || componentName) {
105
- componentId++;
106
- if (componentName) {
107
- const upperFirstName = componentName.slice(0, 1).toUpperCase() + componentName.slice(1);
108
- const jsxElement = t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier(upperFirstName), [], true), null, [], true);
109
- path.node.properties.push(t.objectProperty(t.identifier("element"), jsxElement));
110
- }
111
- }
112
- }
113
- });
114
- (0, import_traverse.default)(ast, {
115
- Program(path) {
116
- const lastImportIndex = path.get("body").reduce((lastIndex, p, index) => {
117
- if (t.isImportDeclaration(p.node)) {
118
- lastIndex = index;
119
- }
120
- return lastIndex;
121
- }, -1);
122
- if (lastImportIndex >= 0) {
123
- const lastImport = path.get(`body.${lastImportIndex}`);
124
- [
125
- ...componentDeclarations,
126
- ...lazyComponentDeclarations
127
- ].forEach((declaration) => {
128
- if ("insertAfter" in lastImport) {
129
- lastImport.insertAfter(declaration);
130
- }
131
- });
132
- }
133
- }
134
- });
135
- const { code } = (0, import_generator.default)(ast);
136
- import_fs.default.writeFileSync(filePath, code);
137
- }
138
- // Annotate the CommonJS export names for ESM import in node:
139
- 0 && (module.exports = {
140
- generateRoutes
141
- });