@module-federation/modern-js 0.0.0-next-20241016083243 → 0.0.0-next-20241017102355

package/dist/esm/cli/routes/exportRoutePlugin.js

@@ -0,0 +1,79 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { META_NAME } from "../../constant";
+import { addExpose } from "./utils";
+var moduleFederationExportRoutePlugin = function(param) {
+  var userConfig = param.userConfig, internalOptions = param.internalOptions, entries = param.entries;
+  return {
+    name: "@modern-js/plugin-module-federation-export-routes",
+    pre: [
+      "@modern-js/plugin-module-federation-route"
+    ],
+    post: [
+      "@modern-js/plugin-router",
+      "@modern-js/plugin-module-federation"
+    ],
+    setup: function() {
+      var _ref = _async_to_generator(function(param2) {
+        var useAppContext, appContext, _internalOptions_metaName, metaName, internalDirectory;
+        return _ts_generator(this, function(_state) {
+          useAppContext = param2.useAppContext;
+          if (!userConfig.exportRoutes) {
+            return [
+              2
+            ];
+          }
+          appContext = useAppContext();
+          _internalOptions_metaName = internalOptions.metaName, metaName = _internalOptions_metaName === void 0 ? META_NAME : _internalOptions_metaName;
+          internalDirectory = appContext.internalDirectory.replace(META_NAME, metaName || META_NAME);
+          return [
+            2,
+            {
+              config: /* @__PURE__ */ _async_to_generator(function() {
+                return _ts_generator(this, function(_state2) {
+                  return [
+                    2,
+                    {
+                      tools: {
+                        // bundlerChain can not keep target order
+                        rspack: function rspack(_config, param3) {
+                          var isServer = param3.isServer;
+                          addExpose({
+                            mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
+                            metaName,
+                            isServer,
+                            internalDirectory,
+                            entries
+                          });
+                        },
+                        // bundlerChain can not keep target order
+                        webpack: function webpack(_config, param3) {
+                          var isServer = param3.isServer;
+                          addExpose({
+                            mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
+                            metaName,
+                            isServer,
+                            internalDirectory,
+                            entries
+                          });
+                        }
+                      }
+                    }
+                  ];
+                });
+              })
+            }
+          ];
+        });
+      });
+      return function(_) {
+        return _ref.apply(this, arguments);
+      };
+    }()
+  };
+};
+var exportRoutePlugin_default = moduleFederationExportRoutePlugin;
+export {
+  exportRoutePlugin_default as default,
+  moduleFederationExportRoutePlugin
+};

package/dist/esm/cli/routes/importRoutesPlugin.js

@@ -0,0 +1,122 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { META_NAME } from "../../constant";
+import { clearMFCache } from "./clearMFCache";
+function _transformRuntimeOptions(buildOptions) {
+  var remotes = buildOptions.remotes || {};
+  var runtimeRemotes = Object.entries(remotes).map(function(remote) {
+    var _remote = _sliced_to_array(remote, 2), alias = _remote[0], nameAndEntry = _remote[1];
+    var _nameAndEntry_split = _sliced_to_array(nameAndEntry.split("@"), 2), name = _nameAndEntry_split[0], entry = _nameAndEntry_split[1];
+    return {
+      name,
+      entry,
+      alias
+    };
+  });
+  return {
+    name: buildOptions.name,
+    remotes: runtimeRemotes
+  };
+}
+var moduleFederationImportRoutePlugin = function(param) {
+  var userConfig = param.userConfig, internalOptions = param.internalOptions, remotePathMap = param.remotePathMap, _param_serverPlugin = param.serverPlugin, serverPlugin = _param_serverPlugin === void 0 ? "@module-federation/modern-js/fetch-router-server-plugin" : _param_serverPlugin, ssrByRouteIdsMap = param.ssrByRouteIdsMap, transformRuntimeOptions = param.transformRuntimeOptions;
+  return {
+    name: "@modern-js/plugin-module-federation-import-routes",
+    pre: [
+      "@modern-js/plugin-module-federation-route"
+    ],
+    post: [
+      "@modern-js/plugin-router",
+      "@modern-js/plugin-module-federation"
+    ],
+    setup: /* @__PURE__ */ _async_to_generator(function() {
+      var _internalOptions_metaName, metaName, transformRuntimeFn, dataLoaderRemotes, serverPluginOptions, hasDataLoaderRemotes;
+      return _ts_generator(this, function(_state) {
+        if (!userConfig.importRoutes) {
+          return [
+            2
+          ];
+        }
+        _internalOptions_metaName = internalOptions.metaName, metaName = _internalOptions_metaName === void 0 ? META_NAME : _internalOptions_metaName;
+        transformRuntimeFn = transformRuntimeOptions || _transformRuntimeOptions;
+        dataLoaderRemotes = _to_consumable_array(new Set(Object.values(remotePathMap).map(function(i) {
+          return i.name;
+        })));
+        serverPluginOptions = {
+          runtimeOptions: transformRuntimeFn(internalOptions.csrConfig),
+          dataLoaderRemotes,
+          ssrByRouteIdsMap
+        };
+        hasDataLoaderRemotes = function() {
+          return Boolean(serverPluginOptions.dataLoaderRemotes.length);
+        };
+        return [
+          2,
+          {
+            _internalRuntimePlugins: function(param2) {
+              var entrypoint = param2.entrypoint, plugins = param2.plugins;
+              if (!hasDataLoaderRemotes()) {
+                return {
+                  entrypoint,
+                  plugins
+                };
+              }
+              plugins.push({
+                name: "ssrDataLoader",
+                path: "@module-federation/modern-js/routes",
+                config: {
+                  metaName,
+                  dataLoaderRemotes
+                }
+              });
+              plugins.push({
+                name: "ssrDataLoaderInjectAssets",
+                path: "@module-federation/modern-js/routes-inject-assets",
+                config: {
+                  metaName,
+                  dataLoaderRemotes
+                }
+              });
+              return {
+                entrypoint,
+                plugins
+              };
+            },
+            _internalServerPlugins: function _internalServerPlugins(param2) {
+              var plugins = param2.plugins;
+              if (!hasDataLoaderRemotes()) {
+                return {
+                  plugins
+                };
+              }
+              plugins.push({
+                name: serverPlugin,
+                options: serverPluginOptions
+              });
+              return {
+                plugins
+              };
+            },
+            afterDev: function afterDev() {
+              return _async_to_generator(function() {
+                return _ts_generator(this, function(_state2) {
+                  clearMFCache();
+                  return [
+                    2
+                  ];
+                });
+              })();
+            }
+          }
+        ];
+      });
+    })
+  };
+};
+var importRoutesPlugin_default = moduleFederationImportRoutePlugin;
+export {
+  importRoutesPlugin_default as default,
+  moduleFederationImportRoutePlugin
+};

package/dist/esm/cli/{dataLoader → routes}/plugin.js

@@ -1,64 +1,50 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "path";
 import { fs } from "@modern-js/utils";
-import { transformName2Prefix } from "../../runtime/dataLoader/utils";
-import { DEFAULT_ENTRY, ROUTE_ID } from "../../constant";
+import { transformName2Prefix } from "../../runtime/routes/utils";
 import { META_NAME } from "../../constant";
-import { generateRoutes } from "./ast";
-import { generateRouteFile } from "./generateRouteFile";
-import { patchMFConfig } from "./patchMFConfig";
-import { clearMFCache } from "./clearMFCache";
-import path from "path";
-function _transformRuntimeOptions(buildOptions) {
-  var remotes = buildOptions.remotes || {};
-  var runtimeRemotes = Object.entries(remotes).map(function(remote) {
-    var _remote = _sliced_to_array(remote, 2), alias = _remote[0], nameAndEntry = _remote[1];
-    var _nameAndEntry_split = _sliced_to_array(nameAndEntry.split("@"), 2), name = _nameAndEntry_split[0], entry = _nameAndEntry_split[1];
-    return {
-      name,
-      entry,
-      alias
-    };
-  });
-  return {
-    name: buildOptions.name,
-    remotes: runtimeRemotes
+import { traverseRouteFiles } from "./traverseRouteFiles";
+import { moduleFederationExportRoutePlugin } from "./exportRoutePlugin";
+import { moduleFederationImportRoutePlugin } from "./importRoutesPlugin";
+import { addShared } from "./utils";
+import { DEFAULT_ENTRY, ROUTE_ID } from "../../constant";
+var moduleFederationRoutesPlugin = function(param) {
+  var userConfig = param.userConfig, internalOptions = param.internalOptions, serverPlugin = param.serverPlugin, transformRuntimeOptions = param.transformRuntimeOptions;
+  var entries = /* @__PURE__ */ new Set();
+  var remotePathMap = {};
+  var ssrByRouteIdsMap = {};
+  var internalRoutesPluginOptions = {
+    userConfig,
+    internalOptions,
+    entries,
+    remotePathMap,
+    ssrByRouteIdsMap,
+    serverPlugin,
+    transformRuntimeOptions
   };
-}
-var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userConfig) {
   return {
-    name: "@modern-js/plugin-module-federation-data-loader",
+    name: "@modern-js/plugin-module-federation-route",
     pre: [
       "@modern-js/plugin-module-federation-config"
     ],
-    post: [
-      "@modern-js/plugin-router",
-      "@modern-js/plugin-module-federation"
-    ],
     setup: function() {
-      var _ref = _async_to_generator(function(param) {
-        var useAppContext, _userConfig_serverPlugin, serverPlugin, transformRuntimeOptions, appContext, name, _internalOptions_metaName, metaName, internalDirectory, transformRuntimeFn, entries, remotePathMap, ssrByRouteIdsMap, csrConfig, _ref2, scanEntries, scanRemotePathMap, dataLoaderRemotes, serverPluginOptions, hasDataLoaderRemotes;
+      var _ref = _async_to_generator(function(param2) {
+        var useAppContext, appContext, name, _internalOptions_metaName, metaName, internalDirectory, csrConfig, _ref2, scanEntries;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
-              useAppContext = param.useAppContext;
-              if (!enable) {
+              useAppContext = param2.useAppContext;
+              if (!userConfig.exportRoutes && !userConfig.importRoutes) {
                 return [
                   2
                 ];
               }
-              _userConfig_serverPlugin = userConfig.serverPlugin, serverPlugin = _userConfig_serverPlugin === void 0 ? "@module-federation/modern-js/data-loader-server" : _userConfig_serverPlugin, transformRuntimeOptions = userConfig.transformRuntimeOptions;
               appContext = useAppContext();
               name = internalOptions.csrConfig.name;
               _internalOptions_metaName = internalOptions.metaName, metaName = _internalOptions_metaName === void 0 ? META_NAME : _internalOptions_metaName;
               internalDirectory = appContext.internalDirectory.replace(META_NAME, metaName || META_NAME);
-              transformRuntimeFn = transformRuntimeOptions || _transformRuntimeOptions;
-              entries = /* @__PURE__ */ new Set();
-              remotePathMap = {};
-              ssrByRouteIdsMap = {};
               csrConfig = internalOptions.csrConfig;
               if (!(_type_of(csrConfig.remotes) === "object" && Object.keys(csrConfig.remotes).length))
                 return [
@@ -67,16 +53,17 @@ var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userCon
                 ];
               return [
                 4,
-                generateRouteFile({
-                  appDirectory: appContext.appDirectory
+                traverseRouteFiles({
+                  appDirectory: appContext.appDirectory,
+                  generateRouteFile: userConfig.importRoutes,
+                  remotePathMap
                 })
               ];
             case 1:
-              _ref2 = _state.sent(), scanEntries = _ref2.entries, scanRemotePathMap = _ref2.remotePathMap;
+              _ref2 = _state.sent(), scanEntries = _ref2.entries;
               scanEntries.forEach(function(e) {
                 return entries.add(e);
               });
-              remotePathMap = scanRemotePathMap;
               return [
                 3,
                 3
@@ -85,64 +72,47 @@ var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userCon
               entries.add(DEFAULT_ENTRY);
               _state.label = 3;
             case 3:
-              dataLoaderRemotes = _to_consumable_array(new Set(Object.values(remotePathMap).map(function(i) {
-                return i.name;
-              })));
-              serverPluginOptions = {
-                runtimeOptions: transformRuntimeFn(internalOptions.csrConfig),
-                dataLoaderRemotes,
-                ssrByRouteIdsMap
-              };
-              hasDataLoaderRemotes = function() {
-                return Boolean(serverPluginOptions.dataLoaderRemotes.length);
-              };
               return [
                 2,
                 {
-                  _internalRuntimePlugins: function(param2) {
-                    var entrypoint = param2.entrypoint, plugins = param2.plugins;
-                    if (!hasDataLoaderRemotes()) {
-                      return {
-                        entrypoint,
-                        plugins
-                      };
-                    }
-                    plugins.push({
-                      name: "ssrDataLoader",
-                      path: "@module-federation/modern-js/data-loader",
-                      config: {
-                        metaName,
-                        dataLoaderRemotes
-                      }
-                    });
-                    plugins.push({
-                      name: "ssrDataLoaderInjectAssets",
-                      path: "@module-federation/modern-js/data-loader-inject-assets",
-                      config: {
-                        metaName,
-                        dataLoaderRemotes
-                      }
-                    });
-                    return {
-                      entrypoint,
-                      plugins
-                    };
-                  },
-                  _internalServerPlugins: function _internalServerPlugins(param2) {
-                    var plugins = param2.plugins;
-                    if (!hasDataLoaderRemotes()) {
-                      return {
-                        plugins
-                      };
-                    }
-                    plugins.push({
-                      name: serverPlugin,
-                      options: serverPluginOptions
+                  config: /* @__PURE__ */ _async_to_generator(function() {
+                    return _ts_generator(this, function(_state2) {
+                      return [
+                        2,
+                        {
+                          tools: {
+                            // bundlerChain can not keep target order
+                            rspack: function rspack(_config, param3) {
+                              var isServer = param3.isServer;
+                              addShared({
+                                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
+                                metaName,
+                                isServer,
+                                internalDirectory,
+                                entries
+                              });
+                            },
+                            // bundlerChain can not keep target order
+                            webpack: function webpack(_config, param3) {
+                              var isServer = param3.isServer;
+                              addShared({
+                                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
+                                metaName,
+                                isServer,
+                                internalDirectory,
+                                entries
+                              });
+                            }
+                          },
+                          source: {
+                            define: {
+                              MODERN_ROUTER_ID_PREFIX: JSON.stringify(transformName2Prefix(name))
+                            }
+                          }
+                        }
+                      ];
                     });
-                    return {
-                      plugins
-                    };
-                  },
+                  }),
                   modifyFileSystemRoutes: function modifyFileSystemRoutes(options) {
                     return _async_to_generator(function() {
                       var routes, entrypoint, entryName, prefix, modifyRouteIds;
@@ -273,54 +243,6 @@ var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userCon
                         }
                       });
                     })();
-                  },
-                  config: /* @__PURE__ */ _async_to_generator(function() {
-                    return _ts_generator(this, function(_state2) {
-                      return [
-                        2,
-                        {
-                          tools: {
-                            // bundlerChain can not keep target order
-                            rspack: function rspack(_config, param2) {
-                              var isServer = param2.isServer;
-                              patchMFConfig({
-                                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
-                                metaName,
-                                isServer,
-                                internalDirectory,
-                                entries
-                              });
-                            },
-                            // bundlerChain can not keep target order
-                            webpack: function webpack(_config, param2) {
-                              var isServer = param2.isServer;
-                              patchMFConfig({
-                                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
-                                metaName,
-                                isServer,
-                                internalDirectory,
-                                entries
-                              });
-                            }
-                          },
-                          source: {
-                            define: {
-                              MODERN_ROUTER_ID_PREFIX: JSON.stringify(transformName2Prefix(name))
-                            }
-                          }
-                        }
-                      ];
-                    });
-                  }),
-                  afterDev: function afterDev() {
-                    return _async_to_generator(function() {
-                      return _ts_generator(this, function(_state2) {
-                        clearMFCache();
-                        return [
-                          2
-                        ];
-                      });
-                    })();
                   }
                 }
               ];
@@ -330,12 +252,15 @@ var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userCon
       return function(_) {
         return _ref.apply(this, arguments);
       };
-    }()
+    }(),
+    usePlugins: [
+      moduleFederationExportRoutePlugin(internalRoutesPluginOptions),
+      moduleFederationImportRoutePlugin(internalRoutesPluginOptions)
+    ]
   };
 };
-var plugin_default = moduleFederationDataLoaderPlugin;
+var plugin_default = moduleFederationRoutesPlugin;
 export {
   plugin_default as default,
-  generateRoutes,
-  moduleFederationDataLoaderPlugin
+  moduleFederationRoutesPlugin
 };

package/dist/esm/cli/{dataLoader/generateRouteFile.js → routes/traverseRouteFiles.js}

@@ -5,7 +5,7 @@ import { fs, normalizeToPosixPath } from "@modern-js/utils";
 import path from "path";
 import os from "os";
 import { DEFAULT_ENTRY, MF_JSON, ROUTE_ID } from "../../constant";
-import { getRemoteLayoutId } from "../../runtime/dataLoader/utils";
+import { getRemoteLayoutId } from "../../runtime/routes/utils";
 var ROUTES = "routes";
 function calcPathName(filePath, rootDir, entry) {
   var relativePath = path.relative(rootDir, filePath);
@@ -37,18 +37,17 @@ function calcPathName(filePath, rootDir, entry) {
     return !!p;
   }).join("/"));
 }
-function generateRouteFile(options) {
-  return _generateRouteFile.apply(this, arguments);
+function traverseRouteFiles(options) {
+  return _traverseRouteFiles.apply(this, arguments);
 }
-function _generateRouteFile() {
-  _generateRouteFile = _async_to_generator(function(options) {
-    var appDirectory, entries, remotePathMap, srcPath, traverse, traverseRoutes, normalizedEntries;
+function _traverseRouteFiles() {
+  _traverseRouteFiles = _async_to_generator(function(options) {
+    var appDirectory, generateRouteFile, remotePathMap, entries, srcPath, traverse, traverseRoutes, normalizedEntries;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          appDirectory = options.appDirectory;
+          appDirectory = options.appDirectory, generateRouteFile = options.generateRouteFile, remotePathMap = options.remotePathMap;
           entries = [];
-          remotePathMap = {};
           srcPath = "".concat(appDirectory, "/src");
           traverse = function() {
             var _ref = _async_to_generator(function(filepath, rootDir, entry) {
@@ -224,22 +223,29 @@ function _generateRouteFile() {
                     }))
                       return [
                         3,
-                        4
+                        5
                       ];
                     entry = path.relative(srcPath, dir);
                     entries.push(entry);
                     rootDir = "".concat(dir, "/").concat(ROUTES);
+                    if (!generateRouteFile)
+                      return [
+                        3,
+                        4
+                      ];
                     return [
                       4,
                       traverse(rootDir, rootDir, entry)
                     ];
                   case 3:
                     _state2.sent();
+                    _state2.label = 4;
+                  case 4:
                     return [
                       3,
-                      6
+                      7
                     ];
-                  case 4:
+                  case 5:
                     return [
                       4,
                       Promise.all(items.map(function() {
@@ -264,10 +270,10 @@ function _generateRouteFile() {
                         };
                       }()))
                     ];
-                  case 5:
-                    _state2.sent();
-                    _state2.label = 6;
                   case 6:
+                    _state2.sent();
+                    _state2.label = 7;
+                  case 7:
                     return [
                       2
                     ];
@@ -293,16 +299,15 @@ function _generateRouteFile() {
           return [
             2,
             {
-              entries: normalizedEntries,
-              remotePathMap
+              entries: normalizedEntries
             }
           ];
       }
     });
   });
-  return _generateRouteFile.apply(this, arguments);
+  return _traverseRouteFiles.apply(this, arguments);
 }
 export {
   calcPathName,
-  generateRouteFile
+  traverseRouteFiles
 };

package/dist/esm/cli/{dataLoader/patchMFConfig.js → routes/utils.js}

@@ -79,7 +79,8 @@ function addExpose(options) {
   });
 }
 function addShared(options) {
-  var metaName = options.metaName, mfConfig = options.mfConfig;
+  var mfConfig = options.mfConfig;
+  var styledComponents = "styled-components";
   var reactRouterDom = "react-router-dom";
   var reactRouterDomServer = "react-router-dom/server";
   if (!mfConfig.shared) {
@@ -88,6 +89,8 @@ function addShared(options) {
       singleton: true
     }), _define_property(_obj, reactRouterDomServer, {
       singleton: true
+    }), _define_property(_obj, styledComponents, {
+      singleton: true
     }), _obj);
   } else {
     if (!Array.isArray(mfConfig.shared)) {
@@ -97,6 +100,9 @@ function addShared(options) {
       mfConfig.shared[reactRouterDomServer] = {
         singleton: true
       };
+      mfConfig.shared[styledComponents] = {
+        singleton: true
+      };
     } else {
       mfConfig.shared = mfConfig.shared.reduce(function(sum, cur) {
         if (typeof cur === "string") {
@@ -112,13 +118,13 @@ function addShared(options) {
       mfConfig.shared[reactRouterDomServer] = {
         singleton: true
       };
+      mfConfig.shared[styledComponents] = {
+        singleton: true
+      };
     }
   }
 }
-function patchMFConfig(options) {
-  addShared(options);
-  addExpose(options);
-}
 export {
-  patchMFConfig
+  addExpose,
+  addShared
 };

package/dist/esm/cli/server/{dataLoaderPlugin.js → fetchRoutePlugin.js}

@@ -4,12 +4,12 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { init } from "@module-federation/enhanced/runtime";
 import { isBrowserEnv } from "@module-federation/sdk";
 import { fetchRemoteFullRoutesMap, getSSRByRouteIds } from "./fetchRemoteFullRoutesMap";
-import { injectRemoteRoutes } from "../../runtime/dataLoader/utils";
+import { injectRemoteRoutes } from "../../runtime/routes/utils";
 import { MF_ROUTES, DEFAULT_ENTRY, MODERN_JS_ROUTE_SERVER_LOADER } from "../../constant";
-function dataLoaderPlugin_default(param) {
+function fetchRoutePlugin_default(param) {
   var runtimeOptions = param.runtimeOptions, dataLoaderRemotes = param.dataLoaderRemotes, ssrByRouteIdsMap = param.ssrByRouteIdsMap;
   return {
-    name: "MFDataLoaderServerPlugin",
+    name: "@module-federation/modern-js-fetch-route",
     pre: [
       "@modern-js/plugin-inject-resource"
     ],
@@ -100,5 +100,5 @@ function dataLoaderPlugin_default(param) {
 }
 ;
 export {
-  dataLoaderPlugin_default as default
+  fetchRoutePlugin_default as default
 };