@module-federation/modern-js 0.18.0 → 0.18.1

package/dist/cjs/cli/configPlugin.js

@@ -40,6 +40,7 @@ __export(configPlugin_exports, {
 });
 module.exports = __toCommonJS(configPlugin_exports);
 var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
 var import_utils = require("./utils");
 var import_sdk = require("@module-federation/sdk");
 var import_node_bundle_require = require("@modern-js/node-bundle-require");
@@ -146,6 +147,17 @@ const patchMFConfig = (mfConfig, isServer, remoteIpStrategy, enableSSR) => {
   const runtimePlugins = [
     ...mfConfig.runtimePlugins || []
   ];
+  try {
+    const nodeModulesPath = import_path.default.resolve(process.cwd(), "node_modules");
+    const bridgeReactPath = import_path.default.join(nodeModulesPath, "@module-federation/bridge-react");
+    if (import_fs.default.existsSync(bridgeReactPath) && (!(mfConfig === null || mfConfig === void 0 ? void 0 : mfConfig.bridge) || !mfConfig.bridge.disableAlias)) {
+      mfConfig.bridge = {
+        disableAlias: true
+      };
+      import_logger.default.debug(`${import_constant.PLUGIN_IDENTIFIER} use "@module-federation/modern-js/react" instead of "@module-federation/bridge-react" !`);
+    }
+  } catch (e) {
+  }
   patchDTSConfig(mfConfig, isServer);
   injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
   if (enableSSR && (0, import_utils3.isDev)()) {

package/dist/cjs/react/index.js

@@ -3,10 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -15,30 +11,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var react_exports = {};
-__export(react_exports, {
-  CacheSize: () => import_bridge_react.CacheSize,
-  CacheTime: () => import_bridge_react.CacheTime,
-  ERROR_TYPE: () => import_bridge_react.ERROR_TYPE,
-  cache: () => import_bridge_react.cache,
-  clearStore: () => import_bridge_react.clearStore,
-  configureCache: () => import_bridge_react.configureCache,
-  generateKey: () => import_bridge_react.generateKey,
-  lazyLoadComponentPlugin: () => import_bridge_react.lazyLoadComponentPlugin,
-  revalidateTag: () => import_bridge_react.revalidateTag
-});
 module.exports = __toCommonJS(react_exports);
-var import_bridge_react = require("@module-federation/bridge-react");
+__reExport(react_exports, require("@module-federation/bridge-react"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CacheSize,
-  CacheTime,
-  ERROR_TYPE,
-  cache,
-  clearStore,
-  configureCache,
-  generateKey,
-  lazyLoadComponentPlugin,
-  revalidateTag
+  ...require("@module-federation/bridge-react")
 });

package/dist/esm/cli/configPlugin.js

@@ -5,6 +5,7 @@ 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 "fs";
 import { getIPV4, isWebTarget, skipByTarget } from "./utils";
 import { encodeName } from "@module-federation/sdk";
 import { bundle } from "@modern-js/node-bundle-require";
@@ -136,6 +137,17 @@ var patchMFConfig = function(mfConfig, isServer, remoteIpStrategy, enableSSR) {
     throw new Error("".concat(PLUGIN_IDENTIFIER, " mfConfig.name can not be empty!"));
   }
   var runtimePlugins = _to_consumable_array(mfConfig.runtimePlugins || []);
+  try {
+    var nodeModulesPath = path.resolve(process.cwd(), "node_modules");
+    var bridgeReactPath = path.join(nodeModulesPath, "@module-federation/bridge-react");
+    if (fs.existsSync(bridgeReactPath) && (!(mfConfig === null || mfConfig === void 0 ? void 0 : mfConfig.bridge) || !mfConfig.bridge.disableAlias)) {
+      mfConfig.bridge = {
+        disableAlias: true
+      };
+      logger.debug("".concat(PLUGIN_IDENTIFIER, ' use "@module-federation/modern-js/react" instead of "@module-federation/bridge-react" !'));
+    }
+  } catch (e) {
+  }
   patchDTSConfig(mfConfig, isServer);
   injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
   if (enableSSR && isDev()) {

package/dist/esm/react/index.js

@@ -1,12 +1 @@
-import { ERROR_TYPE, CacheSize, CacheTime, configureCache, generateKey, cache, revalidateTag, clearStore, lazyLoadComponentPlugin } from "@module-federation/bridge-react";
-export {
-  CacheSize,
-  CacheTime,
-  ERROR_TYPE,
-  cache,
-  clearStore,
-  configureCache,
-  generateKey,
-  lazyLoadComponentPlugin,
-  revalidateTag
-};
+export * from "@module-federation/bridge-react";

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

@@ -1,4 +1,5 @@
 import path from "path";
+import fs from "fs";
 import { getIPV4, isWebTarget, skipByTarget } from "./utils";
 import { encodeName } from "@module-federation/sdk";
 import { bundle } from "@modern-js/node-bundle-require";
@@ -105,6 +106,17 @@ const patchMFConfig = (mfConfig, isServer, remoteIpStrategy, enableSSR) => {
   const runtimePlugins = [
     ...mfConfig.runtimePlugins || []
   ];
+  try {
+    const nodeModulesPath = path.resolve(process.cwd(), "node_modules");
+    const bridgeReactPath = path.join(nodeModulesPath, "@module-federation/bridge-react");
+    if (fs.existsSync(bridgeReactPath) && (!(mfConfig === null || mfConfig === void 0 ? void 0 : mfConfig.bridge) || !mfConfig.bridge.disableAlias)) {
+      mfConfig.bridge = {
+        disableAlias: true
+      };
+      logger.debug(`${PLUGIN_IDENTIFIER} use "@module-federation/modern-js/react" instead of "@module-federation/bridge-react" !`);
+    }
+  } catch (e) {
+  }
   patchDTSConfig(mfConfig, isServer);
   injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
   if (enableSSR && isDev()) {

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

@@ -1,12 +1 @@
-import { ERROR_TYPE, CacheSize, CacheTime, configureCache, generateKey, cache, revalidateTag, clearStore, lazyLoadComponentPlugin } from "@module-federation/bridge-react";
-export {
-  CacheSize,
-  CacheTime,
-  ERROR_TYPE,
-  cache,
-  clearStore,
-  configureCache,
-  generateKey,
-  lazyLoadComponentPlugin,
-  revalidateTag
-};
+export * from "@module-federation/bridge-react";

package/dist/types/react/index.d.ts

@@ -1,2 +1 @@
-export { ERROR_TYPE, CacheSize, CacheTime, configureCache, generateKey, cache, revalidateTag, clearStore, lazyLoadComponentPlugin, } from '@module-federation/bridge-react';
-export type { DataFetchParams, CacheStatus, CacheStatsInfo, } from '@module-federation/bridge-react';
+export * from '@module-federation/bridge-react';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "files": [
     "dist/",
     "types.d.ts",
@@ -49,17 +49,17 @@
     "./shared-strategy": {
       "types": "./dist/types/cli/mfRuntimePlugins/shared-strategy.d.ts",
       "import": "./dist/esm/cli/mfRuntimePlugins/shared-strategy.js",
-      "require": "./dist/esm/cli/mfRuntimePlugins/shared-strategy.js"
+      "require": "./dist/cjs/cli/mfRuntimePlugins/shared-strategy.js"
     },
     "./resolve-entry-ipv4": {
       "types": "./dist/types/cli/mfRuntimePlugins/resolve-entry-ipv4.d.ts",
       "import": "./dist/esm/cli/mfRuntimePlugins/resolve-entry-ipv4.js",
-      "require": "./dist/esm/cli/mfRuntimePlugins/resolve-entry-ipv4.js"
+      "require": "./dist/cjs/cli/mfRuntimePlugins/resolve-entry-ipv4.js"
     },
     "./inject-node-fetch": {
       "types": "./dist/types/cli/mfRuntimePlugins/inject-node-fetch.d.ts",
       "import": "./dist/esm/cli/mfRuntimePlugins/inject-node-fetch.js",
-      "require": "./dist/esm/cli/mfRuntimePlugins/inject-node-fetch.js"
+      "require": "./dist/cjs/cli/mfRuntimePlugins/inject-node-fetch.js"
     },
     "./data-fetch-server-plugin": {
       "types": "./dist/types/cli/server/data-fetch-server-plugin.d.ts",
@@ -119,13 +119,13 @@
     "@swc/helpers": "^0.5.17",
     "node-fetch": "~3.3.0",
     "react-error-boundary": "4.1.2",
-    "@module-federation/rsbuild-plugin": "0.18.0",
-    "@module-federation/bridge-react": "0.18.0",
-    "@module-federation/enhanced": "0.18.0",
-    "@module-federation/runtime": "0.18.0",
-    "@module-federation/node": "2.7.11",
-    "@module-federation/sdk": "0.18.0",
-    "@module-federation/cli": "0.18.0"
+    "@module-federation/rsbuild-plugin": "0.18.1",
+    "@module-federation/bridge-react": "0.18.1",
+    "@module-federation/enhanced": "0.18.1",
+    "@module-federation/runtime": "0.18.1",
+    "@module-federation/node": "2.7.12",
+    "@module-federation/sdk": "0.18.1",
+    "@module-federation/cli": "0.18.1"
   },
   "devDependencies": {
     "@modern-js/core": "2.68.2",
@@ -137,7 +137,7 @@
     "@modern-js/tsconfig": "2.68.2",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
-    "@module-federation/manifest": "0.18.0"
+    "@module-federation/manifest": "0.18.1"
   },
   "peerDependencies": {
     "react": ">=17",