@module-federation/modern-js 0.0.0-next-20241127081350 → 0.0.0-next-20241205062623

package/dist/cjs/cli/configPlugin.js

@@ -84,6 +84,9 @@ const moduleFederationConfigPlugin = (userConfig) => ({
         var _modernjsConfig_source_enableAsyncEntry;
         return {
           tools: {
+            bundlerChain(chain, { isServer }) {
+              (0, import_utils.addMyTypes2Ignored)(chain, isServer ? ssrConfig : csrConfig);
+            },
             rspack(config, { isServer }) {
               var _config_output;
               modifyBundlerConfig({

package/dist/cjs/cli/utils.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  addMyTypes2Ignored: () => addMyTypes2Ignored,
   getIPV4: () => getIPV4,
   getMFConfig: () => getMFConfig,
   patchBundlerConfig: () => patchBundlerConfig,
@@ -35,9 +36,9 @@ __export(utils_exports, {
   patchMFConfig: () => patchMFConfig
 });
 module.exports = __toCommonJS(utils_exports);
-var import_sdk = require("@module-federation/sdk");
-var import_path = __toESM(require("path"));
 var import_os = __toESM(require("os"));
+var import_path = __toESM(require("path"));
+var import_sdk = require("@module-federation/sdk");
 var import_node_bundle_require = require("@modern-js/node-bundle-require");
 var import_constant = require("../constant");
 var import_logger = __toESM(require("./logger"));
@@ -185,39 +186,48 @@ function patchIgnoreWarning(bundlerConfig) {
     return false;
   });
 }
+function addMyTypes2Ignored(chain, mfConfig) {
+  const watchOptions = chain.get("watchOptions");
+  if (!watchOptions || !watchOptions.ignored) {
+    chain.watchOptions({
+      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
+    });
+    return;
+  }
+  const ignored = watchOptions.ignored;
+  const DEFAULT_IGNORED_GLOB = "**/@mf-types/**";
+  if (Array.isArray(ignored)) {
+    if (mfConfig.dts !== false && typeof mfConfig.dts === "object" && typeof mfConfig.dts.consumeTypes === "object" && mfConfig.dts.consumeTypes.remoteTypesFolder) {
+      chain.watchOptions({
+        ...watchOptions,
+        ignored: ignored.concat(`**/${mfConfig.dts.consumeTypes.remoteTypesFolder}/**`)
+      });
+    } else {
+      chain.watchOptions({
+        ...watchOptions,
+        ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
+      });
+    }
+    return;
+  }
+  if (typeof ignored !== "string") {
+    chain.watchOptions({
+      ...watchOptions,
+      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
+    });
+    return;
+  }
+  chain.watchOptions({
+    ...watchOptions,
+    ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
+  });
+}
 function patchBundlerConfig(options) {
   var _modernjsConfig_server, _bundlerConfig_optimization, _bundlerConfig_optimization1, _bundlerConfig_output, _modernjsConfig_deploy;
   const { bundlerConfig, modernjsConfig, isServer, mfConfig, bundlerType } = options;
   const enableSSR = Boolean((_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
   (_bundlerConfig_optimization = bundlerConfig.optimization) === null || _bundlerConfig_optimization === void 0 ? true : delete _bundlerConfig_optimization.runtimeChunk;
   patchIgnoreWarning(bundlerConfig);
-  if (bundlerType === "webpack") {
-    bundlerConfig.watchOptions = bundlerConfig.watchOptions || {};
-    if (!Array.isArray(bundlerConfig.watchOptions.ignored)) {
-      if (bundlerConfig.watchOptions.ignored) {
-        if (typeof bundlerConfig.watchOptions.ignored !== "string") {
-          import_logger.default.warn(`Detect you have set watchOptions.ignore as regexp, please transform it to glob string array and add "**/@mf-types/**" to the array.`);
-        } else {
-          bundlerConfig.watchOptions.ignored = [
-            bundlerConfig.watchOptions.ignored
-          ];
-        }
-      } else {
-        bundlerConfig.watchOptions.ignored = [];
-      }
-    }
-    if (Array.isArray(bundlerConfig.watchOptions.ignored)) {
-      if (mfConfig.dts !== false) {
-        if (typeof mfConfig.dts === "object" && typeof mfConfig.dts.consumeTypes === "object" && mfConfig.dts.consumeTypes.remoteTypesFolder) {
-          bundlerConfig.watchOptions.ignored.push(`**/${mfConfig.dts.consumeTypes.remoteTypesFolder}/**`);
-        } else {
-          bundlerConfig.watchOptions.ignored.push("**/@mf-types/**");
-        }
-      } else {
-        bundlerConfig.watchOptions.ignored.push("**/@mf-types/**");
-      }
-    }
-  }
   if (bundlerConfig.output) {
     var _bundlerConfig_output1, _bundlerConfig_output2;
     if (!((_bundlerConfig_output1 = bundlerConfig.output) === null || _bundlerConfig_output1 === void 0 ? void 0 : _bundlerConfig_output1.chunkLoadingGlobal)) {
@@ -332,6 +342,7 @@ function autoDeleteSplitChunkCacheGroups(mfConfig, bundlerConfig) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  addMyTypes2Ignored,
   getIPV4,
   getMFConfig,
   patchBundlerConfig,

package/dist/cjs/cli/utils.spec.js

@@ -134,11 +134,6 @@ const mfConfig = {
         chunkLoadingGlobal: "chunk_host",
         publicPath: "auto",
         uniqueName: "host"
-      },
-      watchOptions: {
-        ignored: [
-          "**/@mf-types/**"
-        ]
       }
     };
     bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;
@@ -168,11 +163,6 @@ const mfConfig = {
         chunkLoadingGlobal: "chunk_host",
         publicPath: "auto",
         uniqueName: "host"
-      },
-      watchOptions: {
-        ignored: [
-          "**/@mf-types/**"
-        ]
       }
     };
     bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;

package/dist/esm/cli/configPlugin.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { patchBundlerConfig, getIPV4, getMFConfig, patchMFConfig } from "./utils";
+import { patchBundlerConfig, getIPV4, getMFConfig, patchMFConfig, addMyTypes2Ignored } from "./utils";
 function setEnv(enableSSR) {
   if (enableSSR) {
     process.env["MF_DISABLE_EMIT_STATS"] = "true";
@@ -66,6 +66,10 @@ var moduleFederationConfigPlugin = function(userConfig) {
                         2,
                         {
                           tools: {
+                            bundlerChain: function bundlerChain(chain, param2) {
+                              var isServer = param2.isServer;
+                              addMyTypes2Ignored(chain, isServer ? ssrConfig : csrConfig);
+                            },
                             rspack: function rspack(config, param2) {
                               var isServer = param2.isServer;
                               var _config_output;

package/dist/esm/cli/utils.js

@@ -4,9 +4,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 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 { encodeName } from "@module-federation/sdk";
-import path from "path";
 import os from "os";
+import path from "path";
+import { encodeName } from "@module-federation/sdk";
 import { bundle } from "@modern-js/node-bundle-require";
 import { LOCALHOST, PLUGIN_IDENTIFIER } from "../constant";
 import logger from "./logger";
@@ -181,39 +181,44 @@ function patchIgnoreWarning(bundlerConfig) {
     return false;
   });
 }
+function addMyTypes2Ignored(chain, mfConfig) {
+  var watchOptions = chain.get("watchOptions");
+  if (!watchOptions || !watchOptions.ignored) {
+    chain.watchOptions({
+      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
+    });
+    return;
+  }
+  var ignored = watchOptions.ignored;
+  var DEFAULT_IGNORED_GLOB = "**/@mf-types/**";
+  if (Array.isArray(ignored)) {
+    if (mfConfig.dts !== false && _type_of(mfConfig.dts) === "object" && _type_of(mfConfig.dts.consumeTypes) === "object" && mfConfig.dts.consumeTypes.remoteTypesFolder) {
+      chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
+        ignored: ignored.concat("**/".concat(mfConfig.dts.consumeTypes.remoteTypesFolder, "/**"))
+      }));
+    } else {
+      chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
+        ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
+      }));
+    }
+    return;
+  }
+  if (typeof ignored !== "string") {
+    chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
+      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
+    }));
+    return;
+  }
+  chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
+    ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
+  }));
+}
 function patchBundlerConfig(options) {
   var _modernjsConfig_server, _bundlerConfig_optimization, _bundlerConfig_optimization1, _bundlerConfig_output, _modernjsConfig_deploy;
   var bundlerConfig = options.bundlerConfig, modernjsConfig = options.modernjsConfig, isServer = options.isServer, mfConfig = options.mfConfig, bundlerType = options.bundlerType;
   var enableSSR = Boolean((_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
   (_bundlerConfig_optimization = bundlerConfig.optimization) === null || _bundlerConfig_optimization === void 0 ? true : delete _bundlerConfig_optimization.runtimeChunk;
   patchIgnoreWarning(bundlerConfig);
-  if (bundlerType === "webpack") {
-    bundlerConfig.watchOptions = bundlerConfig.watchOptions || {};
-    if (!Array.isArray(bundlerConfig.watchOptions.ignored)) {
-      if (bundlerConfig.watchOptions.ignored) {
-        if (typeof bundlerConfig.watchOptions.ignored !== "string") {
-          logger.warn('Detect you have set watchOptions.ignore as regexp, please transform it to glob string array and add "**/@mf-types/**" to the array.');
-        } else {
-          bundlerConfig.watchOptions.ignored = [
-            bundlerConfig.watchOptions.ignored
-          ];
-        }
-      } else {
-        bundlerConfig.watchOptions.ignored = [];
-      }
-    }
-    if (Array.isArray(bundlerConfig.watchOptions.ignored)) {
-      if (mfConfig.dts !== false) {
-        if (_type_of(mfConfig.dts) === "object" && _type_of(mfConfig.dts.consumeTypes) === "object" && mfConfig.dts.consumeTypes.remoteTypesFolder) {
-          bundlerConfig.watchOptions.ignored.push("**/".concat(mfConfig.dts.consumeTypes.remoteTypesFolder, "/**"));
-        } else {
-          bundlerConfig.watchOptions.ignored.push("**/@mf-types/**");
-        }
-      } else {
-        bundlerConfig.watchOptions.ignored.push("**/@mf-types/**");
-      }
-    }
-  }
   if (bundlerConfig.output) {
     var _bundlerConfig_output1, _bundlerConfig_output2;
     if (!((_bundlerConfig_output1 = bundlerConfig.output) === null || _bundlerConfig_output1 === void 0 ? void 0 : _bundlerConfig_output1.chunkLoadingGlobal)) {
@@ -343,6 +348,7 @@ function autoDeleteSplitChunkCacheGroups(mfConfig, bundlerConfig) {
   }
 }
 export {
+  addMyTypes2Ignored,
   getIPV4,
   getMFConfig,
   patchBundlerConfig,

package/dist/esm/cli/utils.spec.js

@@ -133,11 +133,6 @@ describe("patchBundlerConfig", /* @__PURE__ */ _async_to_generator(function() {
             chunkLoadingGlobal: "chunk_host",
             publicPath: "auto",
             uniqueName: "host"
-          },
-          watchOptions: {
-            ignored: [
-              "**/@mf-types/**"
-            ]
           }
         };
         bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;
@@ -173,11 +168,6 @@ describe("patchBundlerConfig", /* @__PURE__ */ _async_to_generator(function() {
             chunkLoadingGlobal: "chunk_host",
             publicPath: "auto",
             uniqueName: "host"
-          },
-          watchOptions: {
-            ignored: [
-              "**/@mf-types/**"
-            ]
           }
         };
         bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;

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

@@ -1,5 +1,5 @@
 import path from "path";
-import { patchBundlerConfig, getIPV4, getMFConfig, patchMFConfig } from "./utils";
+import { patchBundlerConfig, getIPV4, getMFConfig, patchMFConfig, addMyTypes2Ignored } from "./utils";
 function setEnv(enableSSR) {
   if (enableSSR) {
     process.env["MF_DISABLE_EMIT_STATS"] = "true";
@@ -48,6 +48,9 @@ const moduleFederationConfigPlugin = (userConfig) => ({
         var _modernjsConfig_source_enableAsyncEntry;
         return {
           tools: {
+            bundlerChain(chain, { isServer }) {
+              addMyTypes2Ignored(chain, isServer ? ssrConfig : csrConfig);
+            },
             rspack(config, { isServer }) {
               var _config_output;
               modifyBundlerConfig({

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

@@ -1,6 +1,6 @@
-import { encodeName } from "@module-federation/sdk";
-import path from "path";
 import os from "os";
+import path from "path";
+import { encodeName } from "@module-federation/sdk";
 import { bundle } from "@modern-js/node-bundle-require";
 import { LOCALHOST, PLUGIN_IDENTIFIER } from "../constant";
 import logger from "./logger";
@@ -148,39 +148,48 @@ function patchIgnoreWarning(bundlerConfig) {
     return false;
   });
 }
+function addMyTypes2Ignored(chain, mfConfig) {
+  const watchOptions = chain.get("watchOptions");
+  if (!watchOptions || !watchOptions.ignored) {
+    chain.watchOptions({
+      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
+    });
+    return;
+  }
+  const ignored = watchOptions.ignored;
+  const DEFAULT_IGNORED_GLOB = "**/@mf-types/**";
+  if (Array.isArray(ignored)) {
+    if (mfConfig.dts !== false && typeof mfConfig.dts === "object" && typeof mfConfig.dts.consumeTypes === "object" && mfConfig.dts.consumeTypes.remoteTypesFolder) {
+      chain.watchOptions({
+        ...watchOptions,
+        ignored: ignored.concat(`**/${mfConfig.dts.consumeTypes.remoteTypesFolder}/**`)
+      });
+    } else {
+      chain.watchOptions({
+        ...watchOptions,
+        ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
+      });
+    }
+    return;
+  }
+  if (typeof ignored !== "string") {
+    chain.watchOptions({
+      ...watchOptions,
+      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
+    });
+    return;
+  }
+  chain.watchOptions({
+    ...watchOptions,
+    ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
+  });
+}
 function patchBundlerConfig(options) {
   var _modernjsConfig_server, _bundlerConfig_optimization, _bundlerConfig_optimization1, _bundlerConfig_output, _modernjsConfig_deploy;
   const { bundlerConfig, modernjsConfig, isServer, mfConfig, bundlerType } = options;
   const enableSSR = Boolean((_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
   (_bundlerConfig_optimization = bundlerConfig.optimization) === null || _bundlerConfig_optimization === void 0 ? true : delete _bundlerConfig_optimization.runtimeChunk;
   patchIgnoreWarning(bundlerConfig);
-  if (bundlerType === "webpack") {
-    bundlerConfig.watchOptions = bundlerConfig.watchOptions || {};
-    if (!Array.isArray(bundlerConfig.watchOptions.ignored)) {
-      if (bundlerConfig.watchOptions.ignored) {
-        if (typeof bundlerConfig.watchOptions.ignored !== "string") {
-          logger.warn(`Detect you have set watchOptions.ignore as regexp, please transform it to glob string array and add "**/@mf-types/**" to the array.`);
-        } else {
-          bundlerConfig.watchOptions.ignored = [
-            bundlerConfig.watchOptions.ignored
-          ];
-        }
-      } else {
-        bundlerConfig.watchOptions.ignored = [];
-      }
-    }
-    if (Array.isArray(bundlerConfig.watchOptions.ignored)) {
-      if (mfConfig.dts !== false) {
-        if (typeof mfConfig.dts === "object" && typeof mfConfig.dts.consumeTypes === "object" && mfConfig.dts.consumeTypes.remoteTypesFolder) {
-          bundlerConfig.watchOptions.ignored.push(`**/${mfConfig.dts.consumeTypes.remoteTypesFolder}/**`);
-        } else {
-          bundlerConfig.watchOptions.ignored.push("**/@mf-types/**");
-        }
-      } else {
-        bundlerConfig.watchOptions.ignored.push("**/@mf-types/**");
-      }
-    }
-  }
   if (bundlerConfig.output) {
     var _bundlerConfig_output1, _bundlerConfig_output2;
     if (!((_bundlerConfig_output1 = bundlerConfig.output) === null || _bundlerConfig_output1 === void 0 ? void 0 : _bundlerConfig_output1.chunkLoadingGlobal)) {
@@ -294,6 +303,7 @@ function autoDeleteSplitChunkCacheGroups(mfConfig, bundlerConfig) {
   }
 }
 export {
+  addMyTypes2Ignored,
   getIPV4,
   getMFConfig,
   patchBundlerConfig,

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

@@ -111,11 +111,6 @@ describe("patchBundlerConfig", async () => {
         chunkLoadingGlobal: "chunk_host",
         publicPath: "auto",
         uniqueName: "host"
-      },
-      watchOptions: {
-        ignored: [
-          "**/@mf-types/**"
-        ]
       }
     };
     bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;
@@ -145,11 +140,6 @@ describe("patchBundlerConfig", async () => {
         chunkLoadingGlobal: "chunk_host",
         publicPath: "auto",
         uniqueName: "host"
-      },
-      watchOptions: {
-        ignored: [
-          "**/@mf-types/**"
-        ]
       }
     };
     bundlerConfig === null || bundlerConfig === void 0 ? true : delete bundlerConfig.ignoreWarnings;

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

@@ -1,11 +1,12 @@
-import type { webpack, UserConfig, AppTools, Rspack, Bundler } from '@modern-js/app-tools';
 import { moduleFederationPlugin } from '@module-federation/sdk';
 import { PluginOptions } from '../types';
-import { BundlerConfig } from '../interfaces/bundler';
+import type { BundlerConfig, BundlerChainConfig } from '../interfaces/bundler';
+import type { webpack, UserConfig, AppTools, Rspack, Bundler } from '@modern-js/app-tools';
 export type ConfigType<T> = T extends 'webpack' ? webpack.Configuration : T extends 'rspack' ? Rspack.Configuration : never;
 export declare const getMFConfig: (userConfig: PluginOptions) => Promise<moduleFederationPlugin.ModuleFederationPluginOptions>;
 export declare const patchMFConfig: (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions, isServer: boolean, remoteIpStrategy?: "ipv4" | "inherit") => moduleFederationPlugin.ModuleFederationPluginOptions;
 export declare function patchIgnoreWarning<T extends Bundler>(bundlerConfig: BundlerConfig<T>): void;
+export declare function addMyTypes2Ignored(chain: BundlerChainConfig, mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions): void;
 export declare function patchBundlerConfig<T extends Bundler>(options: {
     bundlerConfig: BundlerConfig<T>;
     isServer: boolean;

package/dist/types/interfaces/bundler.d.ts

@@ -1,4 +1,4 @@
-import type { AppTools, Bundler } from '@modern-js/app-tools';
+import type { AppTools, Bundler, UserConfig } from '@modern-js/app-tools';
 type AppToolsUserConfig<T extends Bundler> = AppTools<T>['userConfig']['tools'];
 type ExcludeUndefined<T> = T extends undefined ? never : T;
 type ExtractObjectType<T> = T extends (...args: any[]) => any ? never : T;
@@ -11,5 +11,8 @@ type RspackConfigs = ExcludeUndefined<AppToolsUserConfig<'rspack'>> extends {
     rspack?: infer U;
 } ? U : never;
 type ObjectRspack = ExtractObjectType<OmitArrayConfiguration<RspackConfigs>>;
+type BundlerChain = ExcludeUndefined<ExcludeUndefined<UserConfig<AppTools>['tools']>['bundlerChain']>;
+type BundlerChainFunc = Extract<BundlerChain, (chain: any, utils: any) => any>;
+export type BundlerChainConfig = Parameters<BundlerChainFunc>[0];
 export type BundlerConfig<T extends Bundler> = T extends 'rspack' ? ObjectRspack : ObjectWebpack;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20241127081350",
+  "version": "0.0.0-next-20241205062623",
   "files": [
     "dist/",
     "types.d.ts",
@@ -85,9 +85,9 @@
     "hoist-non-react-statics": "3.3.2",
     "node-fetch": "~3.3.0",
     "react-error-boundary": "4.0.13",
-    "@module-federation/enhanced": "0.0.0-next-20241127081350",
-    "@module-federation/node": "0.0.0-next-20241127081350",
-    "@module-federation/sdk": "0.0.0-next-20241127081350"
+    "@module-federation/enhanced": "0.0.0-next-20241205062623",
+    "@module-federation/node": "0.0.0-next-20241205062623",
+    "@module-federation/sdk": "0.0.0-next-20241205062623"
   },
   "devDependencies": {
     "@modern-js/app-tools": "2.60.6",
@@ -96,7 +96,7 @@
     "@modern-js/runtime": "2.60.6",
     "@modern-js/tsconfig": "2.60.6",
     "@types/hoist-non-react-statics": "3.3.5",
-    "@module-federation/manifest": "0.0.0-next-20241127081350"
+    "@module-federation/manifest": "0.0.0-next-20241205062623"
   },
   "peerDependencies": {
     "react": ">=17",