@module-federation/bridge-react-webpack-plugin 0.6.2 → 0.6.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @module-federation/bridge-react-webpack-plugin
 
+## 0.6.4
+
+### Patch Changes
+
+- d90295b: chore: adjust bridge router alias strategy to alias to router-v6 when not found react-router-dom in package.json
+  - @module-federation/sdk@0.6.4
+
+## 0.6.3
+
+### Patch Changes
+
+- @module-federation/sdk@0.6.3
+
 ## 0.6.2
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -1648,7 +1648,7 @@ const findPackageJson = (startPath) => {
   }
   return null;
 };
-const getBridgeRouterAlias = (originalAlias) => {
+const getDependencies = () => {
   const userPackageJsonPath = path.resolve(process.cwd(), "package.json");
   let userDependencies = {};
   if (fs.existsSync(userPackageJsonPath)) {
@@ -1660,28 +1660,15 @@ const getBridgeRouterAlias = (originalAlias) => {
       ...userPackageJson.devDependencies
     };
   }
+  return userDependencies;
+};
+const reactRouterDomV5AliasPath = "@module-federation/bridge-react/dist/router-v5.es.js";
+const reactRouterDomV6AliasPath = "@module-federation/bridge-react/dist/router-v6.es.js";
+const setRouterAlias = (majorVersion, reactRouterDomPath) => {
   let bridgeRouterAlias = {};
-  let majorVersion = 0;
-  let reactRouterDomPath = "";
-  const reactRouterDomVersion = userDependencies["react-router-dom"];
-  if (originalAlias) {
-    reactRouterDomPath = originalAlias;
-  } else if (reactRouterDomVersion) {
-    majorVersion = checkVersion(reactRouterDomVersion);
-    reactRouterDomPath = require.resolve("react-router-dom");
-  } else {
-    reactRouterDomPath = require.resolve("react-router-dom");
-  }
-  const packageJsonPath = findPackageJson(reactRouterDomPath);
-  if (packageJsonPath) {
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-    majorVersion = checkVersion(packageJson.version);
-  } else {
-    console.warn("Unable to find package.json for react-router-dom");
-  }
   if (majorVersion === 5) {
     bridgeRouterAlias = {
-      "react-router-dom$": "@module-federation/bridge-react/dist/router-v5.es.js"
+      "react-router-dom$": reactRouterDomV5AliasPath
     };
     try {
       require.resolve("react-router-dom/index.js");
@@ -1693,7 +1680,7 @@ const getBridgeRouterAlias = (originalAlias) => {
     }
   } else if (majorVersion === 6) {
     bridgeRouterAlias = {
-      "react-router-dom$": "@module-federation/bridge-react/dist/router-v6.es.js"
+      "react-router-dom$": reactRouterDomV6AliasPath
     };
     try {
       require.resolve("react-router-dom/dist/index.js");
@@ -1703,15 +1690,33 @@ const getBridgeRouterAlias = (originalAlias) => {
         "react-router-dom/dist/index.js": reactRouterDomPath
       };
     }
-  } else {
-    console.warn("react-router-dom version is not supported");
   }
-  console.log(
-    "<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
-    bridgeRouterAlias
-  );
   return bridgeRouterAlias;
 };
+const getBridgeRouterAlias = (originalAlias) => {
+  const userDependencies = getDependencies();
+  const reactRouterDomPath = originalAlias ? originalAlias : userDependencies["react-router-dom"] ? require.resolve("react-router-dom") : "";
+  const packageJsonPath = reactRouterDomPath ? findPackageJson(reactRouterDomPath) : "";
+  if (packageJsonPath) {
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+    const majorVersion = checkVersion(packageJson.version);
+    const bridgeRouterAlias = setRouterAlias(majorVersion, reactRouterDomPath);
+    console.log(
+      "<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
+      bridgeRouterAlias
+    );
+    return bridgeRouterAlias;
+  } else {
+    const bridgeRouterAlias = {
+      "react-router-dom$": reactRouterDomV6AliasPath
+    };
+    console.log(
+      "<<<<<<<<<<<<< default bridgeRouterAlias >>>>>>>>>>>>>",
+      bridgeRouterAlias
+    );
+    return bridgeRouterAlias;
+  }
+};
 class ReactBridgeAliasChangerPlugin {
   constructor(info) {
     __publicField(this, "alias");

package/dist/index.es.js

@@ -1626,7 +1626,7 @@ const findPackageJson = (startPath) => {
   }
   return null;
 };
-const getBridgeRouterAlias = (originalAlias) => {
+const getDependencies = () => {
   const userPackageJsonPath = path.resolve(process.cwd(), "package.json");
   let userDependencies = {};
   if (fs.existsSync(userPackageJsonPath)) {
@@ -1638,28 +1638,15 @@ const getBridgeRouterAlias = (originalAlias) => {
       ...userPackageJson.devDependencies
     };
   }
+  return userDependencies;
+};
+const reactRouterDomV5AliasPath = "@module-federation/bridge-react/dist/router-v5.es.js";
+const reactRouterDomV6AliasPath = "@module-federation/bridge-react/dist/router-v6.es.js";
+const setRouterAlias = (majorVersion, reactRouterDomPath) => {
   let bridgeRouterAlias = {};
-  let majorVersion = 0;
-  let reactRouterDomPath = "";
-  const reactRouterDomVersion = userDependencies["react-router-dom"];
-  if (originalAlias) {
-    reactRouterDomPath = originalAlias;
-  } else if (reactRouterDomVersion) {
-    majorVersion = checkVersion(reactRouterDomVersion);
-    reactRouterDomPath = require.resolve("react-router-dom");
-  } else {
-    reactRouterDomPath = require.resolve("react-router-dom");
-  }
-  const packageJsonPath = findPackageJson(reactRouterDomPath);
-  if (packageJsonPath) {
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-    majorVersion = checkVersion(packageJson.version);
-  } else {
-    console.warn("Unable to find package.json for react-router-dom");
-  }
   if (majorVersion === 5) {
     bridgeRouterAlias = {
-      "react-router-dom$": "@module-federation/bridge-react/dist/router-v5.es.js"
+      "react-router-dom$": reactRouterDomV5AliasPath
     };
     try {
       require.resolve("react-router-dom/index.js");
@@ -1671,7 +1658,7 @@ const getBridgeRouterAlias = (originalAlias) => {
     }
   } else if (majorVersion === 6) {
     bridgeRouterAlias = {
-      "react-router-dom$": "@module-federation/bridge-react/dist/router-v6.es.js"
+      "react-router-dom$": reactRouterDomV6AliasPath
     };
     try {
       require.resolve("react-router-dom/dist/index.js");
@@ -1681,15 +1668,33 @@ const getBridgeRouterAlias = (originalAlias) => {
         "react-router-dom/dist/index.js": reactRouterDomPath
       };
     }
-  } else {
-    console.warn("react-router-dom version is not supported");
   }
-  console.log(
-    "<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
-    bridgeRouterAlias
-  );
   return bridgeRouterAlias;
 };
+const getBridgeRouterAlias = (originalAlias) => {
+  const userDependencies = getDependencies();
+  const reactRouterDomPath = originalAlias ? originalAlias : userDependencies["react-router-dom"] ? require.resolve("react-router-dom") : "";
+  const packageJsonPath = reactRouterDomPath ? findPackageJson(reactRouterDomPath) : "";
+  if (packageJsonPath) {
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+    const majorVersion = checkVersion(packageJson.version);
+    const bridgeRouterAlias = setRouterAlias(majorVersion, reactRouterDomPath);
+    console.log(
+      "<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
+      bridgeRouterAlias
+    );
+    return bridgeRouterAlias;
+  } else {
+    const bridgeRouterAlias = {
+      "react-router-dom$": reactRouterDomV6AliasPath
+    };
+    console.log(
+      "<<<<<<<<<<<<< default bridgeRouterAlias >>>>>>>>>>>>>",
+      bridgeRouterAlias
+    );
+    return bridgeRouterAlias;
+  }
+};
 class ReactBridgeAliasChangerPlugin {
   constructor(info) {
     __publicField(this, "alias");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react-webpack-plugin",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "publishConfig": {
     "access": "public"
   },
@@ -19,7 +19,7 @@
   "dependencies": {
     "semver": "7.6.3",
     "@types/semver": "7.5.8",
-    "@module-federation/sdk": "0.6.2"
+    "@module-federation/sdk": "0.6.4"
   },
   "devDependencies": {
     "typescript": "^5.2.2",

package/src/utis.ts

@@ -30,9 +30,7 @@ export const findPackageJson = (startPath: string): string | null => {
   return null;
 };
 
-export const getBridgeRouterAlias = (
-  originalAlias: string,
-): Record<string, string> => {
+const getDependencies = () => {
   const userPackageJsonPath = path.resolve(process.cwd(), 'package.json');
   let userDependencies: Record<string, string> = {};
 
@@ -45,35 +43,19 @@ export const getBridgeRouterAlias = (
       ...userPackageJson.devDependencies,
     };
   }
+  return userDependencies;
+};
 
-  let bridgeRouterAlias = {};
-  let majorVersion = 0;
-  let reactRouterDomPath = '';
-
-  const reactRouterDomVersion = userDependencies['react-router-dom'];
-
-  if (originalAlias) {
-    reactRouterDomPath = originalAlias;
-  } else if (reactRouterDomVersion) {
-    majorVersion = checkVersion(reactRouterDomVersion);
-    reactRouterDomPath = require.resolve('react-router-dom');
-  } else {
-    reactRouterDomPath = require.resolve('react-router-dom');
-  }
-
-  const packageJsonPath = findPackageJson(reactRouterDomPath);
-
-  if (packageJsonPath) {
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-    majorVersion = checkVersion(packageJson.version);
-  } else {
-    console.warn('Unable to find package.json for react-router-dom');
-  }
+const reactRouterDomV5AliasPath =
+  '@module-federation/bridge-react/dist/router-v5.es.js';
+const reactRouterDomV6AliasPath =
+  '@module-federation/bridge-react/dist/router-v6.es.js';
 
+const setRouterAlias = (majorVersion: number, reactRouterDomPath: string) => {
+  let bridgeRouterAlias = {};
   if (majorVersion === 5) {
     bridgeRouterAlias = {
-      'react-router-dom$':
-        '@module-federation/bridge-react/dist/router-v5.es.js',
+      'react-router-dom$': reactRouterDomV5AliasPath,
     };
     try {
       require.resolve('react-router-dom/index.js');
@@ -86,10 +68,8 @@ export const getBridgeRouterAlias = (
     }
   } else if (majorVersion === 6) {
     bridgeRouterAlias = {
-      'react-router-dom$':
-        '@module-federation/bridge-react/dist/router-v6.es.js',
+      'react-router-dom$': reactRouterDomV6AliasPath,
     };
-
     try {
       require.resolve('react-router-dom/dist/index.js');
     } catch (error) {
@@ -99,13 +79,40 @@ export const getBridgeRouterAlias = (
         'react-router-dom/dist/index.js': reactRouterDomPath,
       };
     }
-  } else {
-    console.warn('react-router-dom version is not supported');
   }
-
-  console.log(
-    '<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>',
-    bridgeRouterAlias,
-  );
   return bridgeRouterAlias;
 };
+
+export const getBridgeRouterAlias = (
+  originalAlias: string,
+): Record<string, string> => {
+  const userDependencies = getDependencies();
+  const reactRouterDomPath = originalAlias
+    ? originalAlias
+    : userDependencies['react-router-dom']
+      ? require.resolve('react-router-dom')
+      : '';
+  const packageJsonPath = reactRouterDomPath
+    ? findPackageJson(reactRouterDomPath)
+    : '';
+  // if find react-router-dom in package.json
+  if (packageJsonPath) {
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+    const majorVersion = checkVersion(packageJson.version);
+    const bridgeRouterAlias = setRouterAlias(majorVersion, reactRouterDomPath);
+    console.log(
+      '<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>',
+      bridgeRouterAlias,
+    );
+    return bridgeRouterAlias;
+  } else {
+    const bridgeRouterAlias = {
+      'react-router-dom$': reactRouterDomV6AliasPath,
+    };
+    console.log(
+      '<<<<<<<<<<<<< default bridgeRouterAlias >>>>>>>>>>>>>',
+      bridgeRouterAlias,
+    );
+    return bridgeRouterAlias;
+  }
+};