@module-federation/modern-js 0.0.0-next-20240521125425 → 0.0.0-next-20240523080317

package/dist/cjs/cli/index.js

@@ -120,9 +120,9 @@ const moduleFederationPlugin = (userConfig = {}) => ({
                     return;
                   }
                   try {
-                    var _req_url, _req_url1;
+                    var _req_url, _req_url1, _req_url2;
                     const SERVER_PREFIX = `/${import_constant.MODERN_JS_SERVER_DIR}`;
-                    if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith(SERVER_PREFIX)) || ((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes(".json"))) {
+                    if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith(SERVER_PREFIX)) || ((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes(".json")) && !((_req_url2 = req.url) === null || _req_url2 === void 0 ? void 0 : _req_url2.includes("hot-update"))) {
                       const filepath = import_path.default.join(process.cwd(), `dist${req.url}`);
                       import_utils.fs.statSync(filepath);
                       res.setHeader("Access-Control-Allow-Origin", "*");
@@ -138,6 +138,14 @@ const moduleFederationPlugin = (userConfig = {}) => ({
                   }
                 }
               ]
+            },
+            bundlerChain(chain, { isServer }) {
+              if (isDev && !isServer) {
+                chain.externals({
+                  "@module-federation/node/utils": "NOT_USED_IN_BROWSER",
+                  "@module-federation/dts-plugin/server": "NOT_USED_IN_BROWSER"
+                });
+              }
             }
           },
           source: {
@@ -179,7 +187,9 @@ const moduleFederationPlugin = (userConfig = {}) => ({
         }
         plugins.unshift({
           name: SSR_PLUGIN_IDENTIFIER,
-          options: JSON.stringify({})
+          options: JSON.stringify({
+            name: mfConfig.name
+          })
         });
         return {
           entrypoint,

package/dist/cjs/cli/utils.js

@@ -72,9 +72,28 @@ const patchMFConfig = (mfConfig, isServer) => {
   if (typeof mfConfig.async === "undefined") {
     mfConfig.async = true;
   }
+  if (!isServer) {
+    return {
+      ...mfConfig,
+      runtimePlugins,
+      dts: mfConfig.dts === false ? false : {
+        generateTypes: false,
+        consumeTypes: false,
+        ...typeof mfConfig.dts === "object" ? mfConfig.dts : {}
+      },
+      dev: mfConfig.dev === false ? false : {
+        disableHotTypesReload: true,
+        disableLiveReload: false,
+        injectWebClient: true,
+        ...typeof mfConfig.dev === "object" ? mfConfig.dev : {}
+      }
+    };
+  }
   return {
     ...mfConfig,
-    runtimePlugins
+    runtimePlugins,
+    dts: false,
+    dev: false
   };
 };
 function getTargetEnvConfig(mfConfig, isServer) {

package/dist/cjs/ssr-runtime/plugin.js

@@ -31,27 +31,44 @@ __export(plugin_exports, {
   mfPluginSSR: () => mfPluginSSR
 });
 module.exports = __toCommonJS(plugin_exports);
-const mfPluginSSR = () => ({
+const mfPluginSSR = ({ name }) => ({
   name: "@module-federation/modern-js",
-  // eslint-disable-next-line max-lines-per-function
-  setup: () => ({
-    // eslint-disable-next-line max-lines-per-function
-    async init({ context }, next) {
-      if (typeof window !== "undefined") {
+  setup: () => {
+    let mfDevServer;
+    return {
+      async init({ context }, next) {
+        if (typeof window !== "undefined") {
+          return next({
+            context
+          });
+        }
+        const devServer = await Promise.resolve().then(() => __toESM(require("@module-federation/dts-plugin/server")));
+        if (name) {
+          mfDevServer = new devServer.ModuleFederationDevServer({
+            name: `${name}-server`,
+            remotes: [],
+            updateCallback: async () => {
+            },
+            remoteTypeTarPath: ""
+          });
+        }
+        const nodeUtils = await Promise.resolve().then(() => __toESM(require("@module-federation/node/utils")));
+        const shouldUpdate = await nodeUtils.revalidate();
+        if (shouldUpdate) {
+          console.log("should RELOAD", shouldUpdate);
+          await nodeUtils.flushChunks();
+          mfDevServer && mfDevServer.update({
+            updateKind: devServer.UpdateKind.RELOAD_PAGE,
+            updateMode: devServer.UpdateMode.POSITIVE,
+            clientName: name
+          });
+        }
         return next({
           context
         });
       }
-      const nodeUtils = await Promise.resolve().then(() => __toESM(require("@module-federation/node/utils")));
-      const shouldUpdate = await nodeUtils.revalidate();
-      if (shouldUpdate) {
-        console.log("should HMR", shouldUpdate);
-      }
-      return next({
-        context
-      });
-    }
-  })
+    };
+  }
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esm/cli/index.js

@@ -103,9 +103,9 @@ var moduleFederationPlugin = function() {
                                 return;
                               }
                               try {
-                                var _req_url, _req_url1;
+                                var _req_url, _req_url1, _req_url2;
                                 var SERVER_PREFIX = "/".concat(MODERN_JS_SERVER_DIR);
-                                if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith(SERVER_PREFIX)) || ((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes(".json"))) {
+                                if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith(SERVER_PREFIX)) || ((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes(".json")) && !((_req_url2 = req.url) === null || _req_url2 === void 0 ? void 0 : _req_url2.includes("hot-update"))) {
                                   var filepath = path.join(process.cwd(), "dist".concat(req.url));
                                   fs.statSync(filepath);
                                   res.setHeader("Access-Control-Allow-Origin", "*");
@@ -121,6 +121,15 @@ var moduleFederationPlugin = function() {
                               }
                             }
                           ]
+                        },
+                        bundlerChain: function bundlerChain(chain, param2) {
+                          var isServer = param2.isServer;
+                          if (isDev && !isServer) {
+                            chain.externals({
+                              "@module-federation/node/utils": "NOT_USED_IN_BROWSER",
+                              "@module-federation/dts-plugin/server": "NOT_USED_IN_BROWSER"
+                            });
+                          }
                         }
                       },
                       source: {
@@ -164,7 +173,9 @@ var moduleFederationPlugin = function() {
                     }
                     plugins.unshift({
                       name: SSR_PLUGIN_IDENTIFIER,
-                      options: JSON.stringify({})
+                      options: JSON.stringify({
+                        name: mfConfig.name
+                      })
                     });
                     return {
                       entrypoint,

package/dist/esm/cli/utils.js

@@ -66,8 +66,24 @@ var patchMFConfig = function(mfConfig, isServer) {
   if (typeof mfConfig.async === "undefined") {
     mfConfig.async = true;
   }
+  if (!isServer) {
+    return _object_spread_props(_object_spread({}, mfConfig), {
+      runtimePlugins,
+      dts: mfConfig.dts === false ? false : _object_spread({
+        generateTypes: false,
+        consumeTypes: false
+      }, typeof mfConfig.dts === "object" ? mfConfig.dts : {}),
+      dev: mfConfig.dev === false ? false : _object_spread({
+        disableHotTypesReload: true,
+        disableLiveReload: false,
+        injectWebClient: true
+      }, typeof mfConfig.dev === "object" ? mfConfig.dev : {})
+    });
+  }
   return _object_spread_props(_object_spread({}, mfConfig), {
-    runtimePlugins
+    runtimePlugins,
+    dts: false,
+    dev: false
   });
 };
 function getTargetEnvConfig(mfConfig, isServer) {

package/dist/esm/ssr-runtime/plugin.js

@@ -1,54 +1,88 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-var mfPluginSSR = function() {
+var mfPluginSSR = function(param) {
+  var name = param.name;
   return {
     name: "@module-federation/modern-js",
-    // eslint-disable-next-line max-lines-per-function
     setup: function() {
+      var mfDevServer;
       return {
-        init: (
-          // eslint-disable-next-line max-lines-per-function
-          function init(param, next) {
-            var context = param.context;
-            return _async_to_generator(function() {
-              var nodeUtils, shouldUpdate;
-              return _ts_generator(this, function(_state) {
-                switch (_state.label) {
-                  case 0:
-                    if (typeof window !== "undefined") {
-                      return [
-                        2,
-                        next({
-                          context
-                        })
-                      ];
-                    }
-                    return [
-                      4,
-                      import("@module-federation/node/utils")
-                    ];
-                  case 1:
-                    nodeUtils = _state.sent();
-                    return [
-                      4,
-                      nodeUtils.revalidate()
-                    ];
-                  case 2:
-                    shouldUpdate = _state.sent();
-                    if (shouldUpdate) {
-                      console.log("should HMR", shouldUpdate);
-                    }
+        init: function init(param2, next) {
+          var context = param2.context;
+          return _async_to_generator(function() {
+            var devServer, nodeUtils, shouldUpdate;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  if (typeof window !== "undefined") {
                     return [
                       2,
                       next({
                         context
                       })
                     ];
-                }
-              });
-            })();
-          }
-        )
+                  }
+                  return [
+                    4,
+                    import("@module-federation/dts-plugin/server")
+                  ];
+                case 1:
+                  devServer = _state.sent();
+                  if (name) {
+                    mfDevServer = new devServer.ModuleFederationDevServer({
+                      name: "".concat(name, "-server"),
+                      remotes: [],
+                      updateCallback: /* @__PURE__ */ _async_to_generator(function() {
+                        return _ts_generator(this, function(_state2) {
+                          return [
+                            2
+                          ];
+                        });
+                      }),
+                      remoteTypeTarPath: ""
+                    });
+                  }
+                  return [
+                    4,
+                    import("@module-federation/node/utils")
+                  ];
+                case 2:
+                  nodeUtils = _state.sent();
+                  return [
+                    4,
+                    nodeUtils.revalidate()
+                  ];
+                case 3:
+                  shouldUpdate = _state.sent();
+                  if (!shouldUpdate)
+                    return [
+                      3,
+                      5
+                    ];
+                  console.log("should RELOAD", shouldUpdate);
+                  return [
+                    4,
+                    nodeUtils.flushChunks()
+                  ];
+                case 4:
+                  _state.sent();
+                  mfDevServer && mfDevServer.update({
+                    updateKind: devServer.UpdateKind.RELOAD_PAGE,
+                    updateMode: devServer.UpdateMode.POSITIVE,
+                    clientName: name
+                  });
+                  _state.label = 5;
+                case 5:
+                  return [
+                    2,
+                    next({
+                      context
+                    })
+                  ];
+              }
+            });
+          })();
+        }
       };
     }
   };

package/dist/esm-node/cli/index.js

@@ -84,9 +84,9 @@ const moduleFederationPlugin = (userConfig = {}) => ({
                     return;
                   }
                   try {
-                    var _req_url, _req_url1;
+                    var _req_url, _req_url1, _req_url2;
                     const SERVER_PREFIX = `/${MODERN_JS_SERVER_DIR}`;
-                    if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith(SERVER_PREFIX)) || ((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes(".json"))) {
+                    if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith(SERVER_PREFIX)) || ((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes(".json")) && !((_req_url2 = req.url) === null || _req_url2 === void 0 ? void 0 : _req_url2.includes("hot-update"))) {
                       const filepath = path.join(process.cwd(), `dist${req.url}`);
                       fs.statSync(filepath);
                       res.setHeader("Access-Control-Allow-Origin", "*");
@@ -102,6 +102,14 @@ const moduleFederationPlugin = (userConfig = {}) => ({
                   }
                 }
               ]
+            },
+            bundlerChain(chain, { isServer }) {
+              if (isDev && !isServer) {
+                chain.externals({
+                  "@module-federation/node/utils": "NOT_USED_IN_BROWSER",
+                  "@module-federation/dts-plugin/server": "NOT_USED_IN_BROWSER"
+                });
+              }
             }
           },
           source: {
@@ -143,7 +151,9 @@ const moduleFederationPlugin = (userConfig = {}) => ({
         }
         plugins.unshift({
           name: SSR_PLUGIN_IDENTIFIER,
-          options: JSON.stringify({})
+          options: JSON.stringify({
+            name: mfConfig.name
+          })
         });
         return {
           entrypoint,

package/dist/esm-node/cli/utils.js

@@ -36,9 +36,28 @@ const patchMFConfig = (mfConfig, isServer) => {
   if (typeof mfConfig.async === "undefined") {
     mfConfig.async = true;
   }
+  if (!isServer) {
+    return {
+      ...mfConfig,
+      runtimePlugins,
+      dts: mfConfig.dts === false ? false : {
+        generateTypes: false,
+        consumeTypes: false,
+        ...typeof mfConfig.dts === "object" ? mfConfig.dts : {}
+      },
+      dev: mfConfig.dev === false ? false : {
+        disableHotTypesReload: true,
+        disableLiveReload: false,
+        injectWebClient: true,
+        ...typeof mfConfig.dev === "object" ? mfConfig.dev : {}
+      }
+    };
+  }
   return {
     ...mfConfig,
-    runtimePlugins
+    runtimePlugins,
+    dts: false,
+    dev: false
   };
 };
 function getTargetEnvConfig(mfConfig, isServer) {

package/dist/esm-node/ssr-runtime/plugin.js

@@ -1,24 +1,41 @@
-const mfPluginSSR = () => ({
+const mfPluginSSR = ({ name }) => ({
   name: "@module-federation/modern-js",
-  // eslint-disable-next-line max-lines-per-function
-  setup: () => ({
-    // eslint-disable-next-line max-lines-per-function
-    async init({ context }, next) {
-      if (typeof window !== "undefined") {
+  setup: () => {
+    let mfDevServer;
+    return {
+      async init({ context }, next) {
+        if (typeof window !== "undefined") {
+          return next({
+            context
+          });
+        }
+        const devServer = await import("@module-federation/dts-plugin/server");
+        if (name) {
+          mfDevServer = new devServer.ModuleFederationDevServer({
+            name: `${name}-server`,
+            remotes: [],
+            updateCallback: async () => {
+            },
+            remoteTypeTarPath: ""
+          });
+        }
+        const nodeUtils = await import("@module-federation/node/utils");
+        const shouldUpdate = await nodeUtils.revalidate();
+        if (shouldUpdate) {
+          console.log("should RELOAD", shouldUpdate);
+          await nodeUtils.flushChunks();
+          mfDevServer && mfDevServer.update({
+            updateKind: devServer.UpdateKind.RELOAD_PAGE,
+            updateMode: devServer.UpdateMode.POSITIVE,
+            clientName: name
+          });
+        }
         return next({
           context
         });
       }
-      const nodeUtils = await import("@module-federation/node/utils");
-      const shouldUpdate = await nodeUtils.revalidate();
-      if (shouldUpdate) {
-        console.log("should HMR", shouldUpdate);
-      }
-      return next({
-        context
-      });
-    }
-  })
+    };
+  }
 });
 export {
   mfPluginSSR

package/dist/types/cli/utils.d.ts

@@ -5,6 +5,18 @@ export type ConfigType<T> = T extends 'webpack' ? webpack.Configuration : T exte
 export declare const getMFConfig: (userConfig: PluginOptions) => Promise<moduleFederationPlugin.ModuleFederationPluginOptions>;
 export declare const patchMFConfig: (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions, isServer: boolean) => {
     runtimePlugins: string[];
+    dts: boolean | {
+        generateTypes: boolean | moduleFederationPlugin.DtsRemoteOptions;
+        consumeTypes: boolean | moduleFederationPlugin.DtsHostOptions;
+        tsConfigPath?: string | undefined;
+        extraOptions?: Record<string, any> | undefined;
+        implementation?: string | undefined;
+    };
+    dev: boolean | {
+        disableLiveReload: boolean;
+        disableHotTypesReload: boolean;
+        injectWebClient: boolean;
+    };
     exposes?: moduleFederationPlugin.Exposes | undefined;
     filename?: string | undefined;
     library?: moduleFederationPlugin.LibraryOptions | undefined;
@@ -16,12 +28,22 @@ export declare const patchMFConfig: (mfConfig: moduleFederationPlugin.ModuleFede
     shared?: moduleFederationPlugin.Shared | undefined;
     implementation?: string | undefined;
     manifest?: boolean | moduleFederationPlugin.PluginManifestOptions | undefined;
-    dev?: boolean | moduleFederationPlugin.PluginDevOptions | undefined;
-    dts?: boolean | moduleFederationPlugin.PluginDtsOptions | undefined;
     async?: boolean | moduleFederationPlugin.AsyncBoundaryOptions | undefined;
 };
 export declare function getTargetEnvConfig(mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions, isServer: boolean): {
     runtimePlugins: string[];
+    dts: boolean | {
+        generateTypes: boolean | moduleFederationPlugin.DtsRemoteOptions;
+        consumeTypes: boolean | moduleFederationPlugin.DtsHostOptions;
+        tsConfigPath?: string | undefined;
+        extraOptions?: Record<string, any> | undefined;
+        implementation?: string | undefined;
+    };
+    dev: boolean | {
+        disableLiveReload: boolean;
+        disableHotTypesReload: boolean;
+        injectWebClient: boolean;
+    };
     exposes?: moduleFederationPlugin.Exposes | undefined;
     filename?: string | undefined;
     library?: moduleFederationPlugin.LibraryOptions | undefined;
@@ -33,8 +55,6 @@ export declare function getTargetEnvConfig(mfConfig: moduleFederationPlugin.Modu
     shared?: moduleFederationPlugin.Shared | undefined;
     implementation?: string | undefined;
     manifest?: boolean | moduleFederationPlugin.PluginManifestOptions | undefined;
-    dev?: boolean | moduleFederationPlugin.PluginDevOptions | undefined;
-    dts?: boolean | moduleFederationPlugin.PluginDtsOptions | undefined;
     async?: boolean | moduleFederationPlugin.AsyncBoundaryOptions | undefined;
 };
 export declare function patchWebpackConfig<T>(options: {

package/dist/types/ssr-runtime/plugin.d.ts

@@ -1,2 +1,4 @@
 import type { Plugin } from '@modern-js/runtime';
-export declare const mfPluginSSR: () => Plugin;
+export declare const mfPluginSSR: ({ name }: {
+    name?: string | undefined;
+}) => Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20240521125425",
+  "version": "0.0.0-next-20240523080317",
   "files": [
     "dist/",
     "types.d.ts",
@@ -46,9 +46,10 @@
     "@modern-js/utils": "^2.49.2",
     "@modern-js/node-bundle-require": "^2.49.2",
     "node-fetch": "~3.3.0",
-    "@module-federation/sdk": "0.0.0-next-20240521125425",
-    "@module-federation/enhanced": "0.0.0-next-20240521125425",
-    "@module-federation/node": "0.0.0-next-20240521125425"
+    "@module-federation/sdk": "0.0.0-next-20240523080317",
+    "@module-federation/enhanced": "0.0.0-next-20240523080317",
+    "@module-federation/node": "0.0.0-next-20240523080317",
+    "@module-federation/dts-plugin": "0.0.0-next-20240523080317"
   },
   "devDependencies": {
     "@modern-js/app-tools": "^2.49.2",
@@ -56,7 +57,7 @@
     "@modern-js/runtime": "^2.49.2",
     "@modern-js/module-tools": "^2.35.0",
     "@modern-js/tsconfig": "^2.35.0",
-    "@module-federation/manifest": "0.0.0-next-20240521125425"
+    "@module-federation/manifest": "0.0.0-next-20240523080317"
   },
   "peerDependencies": {
     "react": ">=17",