@module-federation/bridge-react-webpack-plugin 0.0.0-next-20240913081127 → 0.0.0-next-20240913095223
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +2 -8
- package/dist/index.cjs.js +27 -32
- package/dist/index.es.js +27 -32
- package/package.json +2 -2
- package/src/utis.ts +38 -45
package/CHANGELOG.md
CHANGED
|
@@ -1,16 +1,10 @@
|
|
|
1
1
|
# @module-federation/bridge-react-webpack-plugin
|
|
2
2
|
|
|
3
|
-
## 0.0.0-next-
|
|
3
|
+
## 0.0.0-next-20240913095223
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
- @module-federation/sdk@0.0.0-next-
|
|
8
|
-
|
|
9
|
-
## 0.6.3
|
|
10
|
-
|
|
11
|
-
### Patch Changes
|
|
12
|
-
|
|
13
|
-
- @module-federation/sdk@0.6.3
|
|
7
|
+
- @module-federation/sdk@0.0.0-next-20240913095223
|
|
14
8
|
|
|
15
9
|
## 0.6.2
|
|
16
10
|
|
package/dist/index.cjs.js
CHANGED
|
@@ -1648,7 +1648,7 @@ const findPackageJson = (startPath) => {
|
|
|
1648
1648
|
}
|
|
1649
1649
|
return null;
|
|
1650
1650
|
};
|
|
1651
|
-
const
|
|
1651
|
+
const getBridgeRouterAlias = (originalAlias) => {
|
|
1652
1652
|
const userPackageJsonPath = path.resolve(process.cwd(), "package.json");
|
|
1653
1653
|
let userDependencies = {};
|
|
1654
1654
|
if (fs.existsSync(userPackageJsonPath)) {
|
|
@@ -1660,15 +1660,28 @@ const getDependencies = () => {
|
|
|
1660
1660
|
...userPackageJson.devDependencies
|
|
1661
1661
|
};
|
|
1662
1662
|
}
|
|
1663
|
-
return userDependencies;
|
|
1664
|
-
};
|
|
1665
|
-
const reactRouterDomV5AliasPath = "@module-federation/bridge-react/dist/router-v5.es.js";
|
|
1666
|
-
const reactRouterDomV6AliasPath = "@module-federation/bridge-react/dist/router-v6.es.js";
|
|
1667
|
-
const setRouterAlias = (majorVersion, reactRouterDomPath) => {
|
|
1668
1663
|
let bridgeRouterAlias = {};
|
|
1664
|
+
let majorVersion = 0;
|
|
1665
|
+
let reactRouterDomPath = "";
|
|
1666
|
+
const reactRouterDomVersion = userDependencies["react-router-dom"];
|
|
1667
|
+
if (originalAlias) {
|
|
1668
|
+
reactRouterDomPath = originalAlias;
|
|
1669
|
+
} else if (reactRouterDomVersion) {
|
|
1670
|
+
majorVersion = checkVersion(reactRouterDomVersion);
|
|
1671
|
+
reactRouterDomPath = require.resolve("react-router-dom");
|
|
1672
|
+
} else {
|
|
1673
|
+
reactRouterDomPath = require.resolve("react-router-dom");
|
|
1674
|
+
}
|
|
1675
|
+
const packageJsonPath = findPackageJson(reactRouterDomPath);
|
|
1676
|
+
if (packageJsonPath) {
|
|
1677
|
+
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
|
|
1678
|
+
majorVersion = checkVersion(packageJson.version);
|
|
1679
|
+
} else {
|
|
1680
|
+
console.warn("Unable to find package.json for react-router-dom");
|
|
1681
|
+
}
|
|
1669
1682
|
if (majorVersion === 5) {
|
|
1670
1683
|
bridgeRouterAlias = {
|
|
1671
|
-
"react-router-dom$":
|
|
1684
|
+
"react-router-dom$": "@module-federation/bridge-react/dist/router-v5.es.js"
|
|
1672
1685
|
};
|
|
1673
1686
|
try {
|
|
1674
1687
|
require.resolve("react-router-dom/index.js");
|
|
@@ -1680,7 +1693,7 @@ const setRouterAlias = (majorVersion, reactRouterDomPath) => {
|
|
|
1680
1693
|
}
|
|
1681
1694
|
} else if (majorVersion === 6) {
|
|
1682
1695
|
bridgeRouterAlias = {
|
|
1683
|
-
"react-router-dom$":
|
|
1696
|
+
"react-router-dom$": "@module-federation/bridge-react/dist/router-v6.es.js"
|
|
1684
1697
|
};
|
|
1685
1698
|
try {
|
|
1686
1699
|
require.resolve("react-router-dom/dist/index.js");
|
|
@@ -1690,32 +1703,14 @@ const setRouterAlias = (majorVersion, reactRouterDomPath) => {
|
|
|
1690
1703
|
"react-router-dom/dist/index.js": reactRouterDomPath
|
|
1691
1704
|
};
|
|
1692
1705
|
}
|
|
1693
|
-
}
|
|
1694
|
-
return bridgeRouterAlias;
|
|
1695
|
-
};
|
|
1696
|
-
const getBridgeRouterAlias = (originalAlias) => {
|
|
1697
|
-
const userDependencies = getDependencies();
|
|
1698
|
-
const reactRouterDomPath = originalAlias ? originalAlias : userDependencies["react-router-dom"] ? require.resolve("react-router-dom") : "";
|
|
1699
|
-
const packageJsonPath = reactRouterDomPath ? findPackageJson(reactRouterDomPath) : "";
|
|
1700
|
-
if (packageJsonPath) {
|
|
1701
|
-
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
|
|
1702
|
-
const majorVersion = checkVersion(packageJson.version);
|
|
1703
|
-
const bridgeRouterAlias = setRouterAlias(majorVersion, reactRouterDomPath);
|
|
1704
|
-
console.log(
|
|
1705
|
-
"<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
|
|
1706
|
-
bridgeRouterAlias
|
|
1707
|
-
);
|
|
1708
|
-
return bridgeRouterAlias;
|
|
1709
1706
|
} else {
|
|
1710
|
-
|
|
1711
|
-
"react-router-dom$": reactRouterDomV6AliasPath
|
|
1712
|
-
};
|
|
1713
|
-
console.log(
|
|
1714
|
-
"<<<<<<<<<<<<< default bridgeRouterAlias >>>>>>>>>>>>>",
|
|
1715
|
-
bridgeRouterAlias
|
|
1716
|
-
);
|
|
1717
|
-
return bridgeRouterAlias;
|
|
1707
|
+
console.warn("react-router-dom version is not supported");
|
|
1718
1708
|
}
|
|
1709
|
+
console.log(
|
|
1710
|
+
"<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
|
|
1711
|
+
bridgeRouterAlias
|
|
1712
|
+
);
|
|
1713
|
+
return bridgeRouterAlias;
|
|
1719
1714
|
};
|
|
1720
1715
|
class ReactBridgeAliasChangerPlugin {
|
|
1721
1716
|
constructor(info) {
|
package/dist/index.es.js
CHANGED
|
@@ -1626,7 +1626,7 @@ const findPackageJson = (startPath) => {
|
|
|
1626
1626
|
}
|
|
1627
1627
|
return null;
|
|
1628
1628
|
};
|
|
1629
|
-
const
|
|
1629
|
+
const getBridgeRouterAlias = (originalAlias) => {
|
|
1630
1630
|
const userPackageJsonPath = path.resolve(process.cwd(), "package.json");
|
|
1631
1631
|
let userDependencies = {};
|
|
1632
1632
|
if (fs.existsSync(userPackageJsonPath)) {
|
|
@@ -1638,15 +1638,28 @@ const getDependencies = () => {
|
|
|
1638
1638
|
...userPackageJson.devDependencies
|
|
1639
1639
|
};
|
|
1640
1640
|
}
|
|
1641
|
-
return userDependencies;
|
|
1642
|
-
};
|
|
1643
|
-
const reactRouterDomV5AliasPath = "@module-federation/bridge-react/dist/router-v5.es.js";
|
|
1644
|
-
const reactRouterDomV6AliasPath = "@module-federation/bridge-react/dist/router-v6.es.js";
|
|
1645
|
-
const setRouterAlias = (majorVersion, reactRouterDomPath) => {
|
|
1646
1641
|
let bridgeRouterAlias = {};
|
|
1642
|
+
let majorVersion = 0;
|
|
1643
|
+
let reactRouterDomPath = "";
|
|
1644
|
+
const reactRouterDomVersion = userDependencies["react-router-dom"];
|
|
1645
|
+
if (originalAlias) {
|
|
1646
|
+
reactRouterDomPath = originalAlias;
|
|
1647
|
+
} else if (reactRouterDomVersion) {
|
|
1648
|
+
majorVersion = checkVersion(reactRouterDomVersion);
|
|
1649
|
+
reactRouterDomPath = require.resolve("react-router-dom");
|
|
1650
|
+
} else {
|
|
1651
|
+
reactRouterDomPath = require.resolve("react-router-dom");
|
|
1652
|
+
}
|
|
1653
|
+
const packageJsonPath = findPackageJson(reactRouterDomPath);
|
|
1654
|
+
if (packageJsonPath) {
|
|
1655
|
+
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
|
|
1656
|
+
majorVersion = checkVersion(packageJson.version);
|
|
1657
|
+
} else {
|
|
1658
|
+
console.warn("Unable to find package.json for react-router-dom");
|
|
1659
|
+
}
|
|
1647
1660
|
if (majorVersion === 5) {
|
|
1648
1661
|
bridgeRouterAlias = {
|
|
1649
|
-
"react-router-dom$":
|
|
1662
|
+
"react-router-dom$": "@module-federation/bridge-react/dist/router-v5.es.js"
|
|
1650
1663
|
};
|
|
1651
1664
|
try {
|
|
1652
1665
|
require.resolve("react-router-dom/index.js");
|
|
@@ -1658,7 +1671,7 @@ const setRouterAlias = (majorVersion, reactRouterDomPath) => {
|
|
|
1658
1671
|
}
|
|
1659
1672
|
} else if (majorVersion === 6) {
|
|
1660
1673
|
bridgeRouterAlias = {
|
|
1661
|
-
"react-router-dom$":
|
|
1674
|
+
"react-router-dom$": "@module-federation/bridge-react/dist/router-v6.es.js"
|
|
1662
1675
|
};
|
|
1663
1676
|
try {
|
|
1664
1677
|
require.resolve("react-router-dom/dist/index.js");
|
|
@@ -1668,32 +1681,14 @@ const setRouterAlias = (majorVersion, reactRouterDomPath) => {
|
|
|
1668
1681
|
"react-router-dom/dist/index.js": reactRouterDomPath
|
|
1669
1682
|
};
|
|
1670
1683
|
}
|
|
1671
|
-
}
|
|
1672
|
-
return bridgeRouterAlias;
|
|
1673
|
-
};
|
|
1674
|
-
const getBridgeRouterAlias = (originalAlias) => {
|
|
1675
|
-
const userDependencies = getDependencies();
|
|
1676
|
-
const reactRouterDomPath = originalAlias ? originalAlias : userDependencies["react-router-dom"] ? require.resolve("react-router-dom") : "";
|
|
1677
|
-
const packageJsonPath = reactRouterDomPath ? findPackageJson(reactRouterDomPath) : "";
|
|
1678
|
-
if (packageJsonPath) {
|
|
1679
|
-
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
|
|
1680
|
-
const majorVersion = checkVersion(packageJson.version);
|
|
1681
|
-
const bridgeRouterAlias = setRouterAlias(majorVersion, reactRouterDomPath);
|
|
1682
|
-
console.log(
|
|
1683
|
-
"<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
|
|
1684
|
-
bridgeRouterAlias
|
|
1685
|
-
);
|
|
1686
|
-
return bridgeRouterAlias;
|
|
1687
1684
|
} else {
|
|
1688
|
-
|
|
1689
|
-
"react-router-dom$": reactRouterDomV6AliasPath
|
|
1690
|
-
};
|
|
1691
|
-
console.log(
|
|
1692
|
-
"<<<<<<<<<<<<< default bridgeRouterAlias >>>>>>>>>>>>>",
|
|
1693
|
-
bridgeRouterAlias
|
|
1694
|
-
);
|
|
1695
|
-
return bridgeRouterAlias;
|
|
1685
|
+
console.warn("react-router-dom version is not supported");
|
|
1696
1686
|
}
|
|
1687
|
+
console.log(
|
|
1688
|
+
"<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>",
|
|
1689
|
+
bridgeRouterAlias
|
|
1690
|
+
);
|
|
1691
|
+
return bridgeRouterAlias;
|
|
1697
1692
|
};
|
|
1698
1693
|
class ReactBridgeAliasChangerPlugin {
|
|
1699
1694
|
constructor(info) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/bridge-react-webpack-plugin",
|
|
3
|
-
"version": "0.0.0-next-
|
|
3
|
+
"version": "0.0.0-next-20240913095223",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"semver": "7.6.3",
|
|
21
21
|
"@types/semver": "7.5.8",
|
|
22
|
-
"@module-federation/sdk": "0.0.0-next-
|
|
22
|
+
"@module-federation/sdk": "0.0.0-next-20240913095223"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"typescript": "^5.2.2",
|
package/src/utis.ts
CHANGED
|
@@ -30,7 +30,9 @@ export const findPackageJson = (startPath: string): string | null => {
|
|
|
30
30
|
return null;
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
-
const
|
|
33
|
+
export const getBridgeRouterAlias = (
|
|
34
|
+
originalAlias: string,
|
|
35
|
+
): Record<string, string> => {
|
|
34
36
|
const userPackageJsonPath = path.resolve(process.cwd(), 'package.json');
|
|
35
37
|
let userDependencies: Record<string, string> = {};
|
|
36
38
|
|
|
@@ -43,19 +45,35 @@ const getDependencies = () => {
|
|
|
43
45
|
...userPackageJson.devDependencies,
|
|
44
46
|
};
|
|
45
47
|
}
|
|
46
|
-
return userDependencies;
|
|
47
|
-
};
|
|
48
48
|
|
|
49
|
-
const reactRouterDomV5AliasPath =
|
|
50
|
-
'@module-federation/bridge-react/dist/router-v5.es.js';
|
|
51
|
-
const reactRouterDomV6AliasPath =
|
|
52
|
-
'@module-federation/bridge-react/dist/router-v6.es.js';
|
|
53
|
-
|
|
54
|
-
const setRouterAlias = (majorVersion: number, reactRouterDomPath: string) => {
|
|
55
49
|
let bridgeRouterAlias = {};
|
|
50
|
+
let majorVersion = 0;
|
|
51
|
+
let reactRouterDomPath = '';
|
|
52
|
+
|
|
53
|
+
const reactRouterDomVersion = userDependencies['react-router-dom'];
|
|
54
|
+
|
|
55
|
+
if (originalAlias) {
|
|
56
|
+
reactRouterDomPath = originalAlias;
|
|
57
|
+
} else if (reactRouterDomVersion) {
|
|
58
|
+
majorVersion = checkVersion(reactRouterDomVersion);
|
|
59
|
+
reactRouterDomPath = require.resolve('react-router-dom');
|
|
60
|
+
} else {
|
|
61
|
+
reactRouterDomPath = require.resolve('react-router-dom');
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
const packageJsonPath = findPackageJson(reactRouterDomPath);
|
|
65
|
+
|
|
66
|
+
if (packageJsonPath) {
|
|
67
|
+
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
|
|
68
|
+
majorVersion = checkVersion(packageJson.version);
|
|
69
|
+
} else {
|
|
70
|
+
console.warn('Unable to find package.json for react-router-dom');
|
|
71
|
+
}
|
|
72
|
+
|
|
56
73
|
if (majorVersion === 5) {
|
|
57
74
|
bridgeRouterAlias = {
|
|
58
|
-
'react-router-dom$':
|
|
75
|
+
'react-router-dom$':
|
|
76
|
+
'@module-federation/bridge-react/dist/router-v5.es.js',
|
|
59
77
|
};
|
|
60
78
|
try {
|
|
61
79
|
require.resolve('react-router-dom/index.js');
|
|
@@ -68,8 +86,10 @@ const setRouterAlias = (majorVersion: number, reactRouterDomPath: string) => {
|
|
|
68
86
|
}
|
|
69
87
|
} else if (majorVersion === 6) {
|
|
70
88
|
bridgeRouterAlias = {
|
|
71
|
-
'react-router-dom$':
|
|
89
|
+
'react-router-dom$':
|
|
90
|
+
'@module-federation/bridge-react/dist/router-v6.es.js',
|
|
72
91
|
};
|
|
92
|
+
|
|
73
93
|
try {
|
|
74
94
|
require.resolve('react-router-dom/dist/index.js');
|
|
75
95
|
} catch (error) {
|
|
@@ -79,40 +99,13 @@ const setRouterAlias = (majorVersion: number, reactRouterDomPath: string) => {
|
|
|
79
99
|
'react-router-dom/dist/index.js': reactRouterDomPath,
|
|
80
100
|
};
|
|
81
101
|
}
|
|
82
|
-
}
|
|
83
|
-
return bridgeRouterAlias;
|
|
84
|
-
};
|
|
85
|
-
|
|
86
|
-
export const getBridgeRouterAlias = (
|
|
87
|
-
originalAlias: string,
|
|
88
|
-
): Record<string, string> => {
|
|
89
|
-
const userDependencies = getDependencies();
|
|
90
|
-
const reactRouterDomPath = originalAlias
|
|
91
|
-
? originalAlias
|
|
92
|
-
: userDependencies['react-router-dom']
|
|
93
|
-
? require.resolve('react-router-dom')
|
|
94
|
-
: '';
|
|
95
|
-
const packageJsonPath = reactRouterDomPath
|
|
96
|
-
? findPackageJson(reactRouterDomPath)
|
|
97
|
-
: '';
|
|
98
|
-
// if find react-router-dom in package.json
|
|
99
|
-
if (packageJsonPath) {
|
|
100
|
-
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
|
|
101
|
-
const majorVersion = checkVersion(packageJson.version);
|
|
102
|
-
const bridgeRouterAlias = setRouterAlias(majorVersion, reactRouterDomPath);
|
|
103
|
-
console.log(
|
|
104
|
-
'<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>',
|
|
105
|
-
bridgeRouterAlias,
|
|
106
|
-
);
|
|
107
|
-
return bridgeRouterAlias;
|
|
108
102
|
} else {
|
|
109
|
-
|
|
110
|
-
'react-router-dom$': reactRouterDomV6AliasPath,
|
|
111
|
-
};
|
|
112
|
-
console.log(
|
|
113
|
-
'<<<<<<<<<<<<< default bridgeRouterAlias >>>>>>>>>>>>>',
|
|
114
|
-
bridgeRouterAlias,
|
|
115
|
-
);
|
|
116
|
-
return bridgeRouterAlias;
|
|
103
|
+
console.warn('react-router-dom version is not supported');
|
|
117
104
|
}
|
|
105
|
+
|
|
106
|
+
console.log(
|
|
107
|
+
'<<<<<<<<<<<<< bridgeRouterAlias >>>>>>>>>>>>>',
|
|
108
|
+
bridgeRouterAlias,
|
|
109
|
+
);
|
|
110
|
+
return bridgeRouterAlias;
|
|
118
111
|
};
|