Skip to content

Commit 2887902

Browse files
Merge pull request #2174 from Web3Auth/fix/peer-deps-issue
fixes peer deps issue
2 parents d39e15a + 6588d73 commit 2887902

File tree

7 files changed

+523
-2972
lines changed

7 files changed

+523
-2972
lines changed

eslint.config.mjs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
import toruslabsTypescript from "@toruslabs/eslint-config-typescript";
22

3-
export default [...toruslabsTypescript];
3+
export default [
4+
...toruslabsTypescript,
5+
{
6+
files: ["packages/no-modal/src/react/wagmi/provider.ts"],
7+
rules: {
8+
"import/no-extraneous-dependencies": "off",
9+
},
10+
},
11+
];

package-lock.json

Lines changed: 486 additions & 2938 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/modal/eslint.config.mjs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ import toruslabsReact from "@toruslabs/eslint-config-react";
33
export default [
44
...toruslabsReact,
55
{
6-
ignores: ["src/vue/WalletServicesInnerProvider.vue"],
6+
ignores: ["./rollup.config.mjs"],
7+
},
8+
{
9+
files: ["./src/react/wagmi/provider.ts"],
10+
rules: {
11+
"import/no-extraneous-dependencies": "off",
12+
},
13+
},
14+
{
15+
files: ["./src/vue/**/*.ts"],
16+
rules: {
17+
"react-hooks/rules-of-hooks": "off",
18+
},
719
},
820
];

packages/modal/package.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,21 @@
3535
"@coinbase/wallet-sdk": {
3636
"optional": true
3737
},
38-
"@tanstack/react-query": {
39-
"optional": true
40-
},
41-
"@wagmi/core": {
42-
"optional": true
43-
},
44-
"@wagmi/vue": {
45-
"optional": true
46-
},
4738
"viem": {
4839
"optional": true
4940
},
5041
"vue": {
5142
"optional": true
52-
},
53-
"wagmi": {
54-
"optional": true
5543
}
5644
},
5745
"peerDependencies": {
5846
"@babel/runtime": "^7.x",
5947
"@coinbase/wallet-sdk": "^4.3.x",
6048
"@solana/web3.js": ">=1.98",
61-
"@wagmi/core": ">=2.16",
62-
"@wagmi/vue": ">=0.1",
6349
"react": ">=18",
6450
"react-dom": ">=18",
6551
"viem": ">=2.23",
66-
"vue": "^3.x",
67-
"wagmi": ">=2.14"
52+
"vue": ">=3.x"
6853
},
6954
"devDependencies": {
7055
"@babel/preset-react": "^7.26.3",
@@ -76,7 +61,6 @@
7661
"@solana/web3.js": "^1.98.2",
7762
"@svgr/rollup": "^8.1.0",
7863
"@svgr/webpack": "^8.1.0",
79-
"@tanstack/react-query": "^5.74.4",
8064
"@toruslabs/eslint-config-react": "^4.1.4",
8165
"@toruslabs/eslint-config-vue": "^4.1.5",
8266
"@toruslabs/isomorphic-style-loader": "^5.4.0",

packages/modal/rollup.config.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import path from "path";
88
import postcss from "rollup-plugin-postcss";
99

1010
const pkg = await readJSONFile(path.resolve("./package.json"));
11+
const allDeps = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), "wagmi", "@wagmi/vue", "@wagmi/core"];
12+
1113
// TODO: use ssr module for cjs build
1214

1315
export const baseConfig = {
@@ -36,4 +38,5 @@ export const baseConfig = {
3638
svgr(),
3739
json(),
3840
],
41+
external: [...allDeps, ...allDeps.map((x) => new RegExp(`^${x}/`)), /@babel\/runtime/],
3942
};

packages/no-modal/package.json

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,21 @@
3434
"peerDependencies": {
3535
"@babel/runtime": "^7.x",
3636
"@coinbase/wallet-sdk": "^4.3.x",
37-
"@wagmi/core": ">=2.14",
38-
"@wagmi/vue": ">=0.1",
3937
"react": ">=18",
4038
"viem": ">=2.23",
41-
"vue": "^3.x",
42-
"wagmi": ">=2.14"
39+
"vue": "^3.x"
4340
},
4441
"peerDependenciesMeta": {
4542
"@coinbase/wallet-sdk": {
4643
"optional": true
4744
},
48-
"@tanstack/react-query": {
49-
"optional": true
50-
},
51-
"@wagmi/core": {
52-
"optional": true
53-
},
54-
"@wagmi/vue": {
55-
"optional": true
56-
},
5745
"react": {
5846
"optional": true
5947
},
60-
"vue": {
48+
"viem": {
6149
"optional": true
6250
},
63-
"wagmi": {
51+
"vue": {
6452
"optional": true
6553
}
6654
},

packages/no-modal/rollup.config.mjs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
import path from "path";
2+
import { readJSONFile } from "@toruslabs/torus-scripts/helpers/utils.js";
3+
4+
const pkg = readJSONFile(path.resolve("./package.json"));
5+
6+
const allDeps = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), "wagmi", "@wagmi/vue", "@wagmi/core"];
7+
18
export const baseConfig = {
29
input: [
310
"./src/index.ts",
@@ -11,4 +18,5 @@ export const baseConfig = {
1118
"./src/providers/xrpl-provider/index.ts",
1219
"./src/providers/ethereum-mpc-provider/index.ts",
1320
],
21+
external: [...allDeps, ...allDeps.map((x) => new RegExp(`^${x}/`)), /@babel\/runtime/],
1422
};

0 commit comments

Comments
 (0)