Skip to content

Commit 919d2c2

Browse files
authored
Merge branch 'develop' into dependabot/npm_and_yarn/packages/neuron-wallet/typeorm-0.3.26
2 parents fc9c2ea + 3f905f9 commit 919d2c2

4 files changed

Lines changed: 24 additions & 27 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"dependencies": {},
6767
"resolutions": {
6868
"@types/react": "18.3.22",
69-
"react-i18next": ">=11.16.4",
69+
"react-i18next": "14.1.3",
7070
"react-refresh": "0.17.0",
7171
"node-fetch": "2.6.13",
7272
"@ckb-lumos/ckb-indexer": "0.23.0",

packages/neuron-ui/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"qr.js": "0.0.0",
6565
"react": "18.3.1",
6666
"react-dom": "18.3.1",
67-
"react-i18next": "13.5.0",
67+
"react-i18next": "14.1.3",
6868
"react-router-dom": "6.21.1",
6969
"react-transition-group": "4.4.5",
7070
"sass": "1.69.5",
@@ -114,8 +114,5 @@
114114
"vite-plugin-node-polyfills": "0.23.0",
115115
"vite-plugin-svgr": "4.3.0",
116116
"vitest": "3.0.8"
117-
},
118-
"resolutions": {
119-
"react-i18next": "14.1.3"
120117
}
121118
}

packages/neuron-wallet/package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"electron-updater": "6.3.0",
6161
"electron-window-state": "5.0.3",
6262
"elliptic": "6.6.1",
63-
"i18next": "21.10.0",
63+
"i18next": "23.7.11",
6464
"leveldown": "6.1.1",
6565
"levelup": "4.4.0",
6666
"reflect-metadata": "0.1.13",
@@ -94,5 +94,12 @@
9494
"jest-when": "3.6.0",
9595
"neuron-ui": "^0.204.0",
9696
"typescript": "5.3.3"
97+
},
98+
"resolutions": {
99+
"@ckb-lumos/base": "0.23.0",
100+
"@ckb-lumos/ckb-indexer": "0.23.0",
101+
"@ckb-lumos/helpers": "0.23.0",
102+
"@ckb-lumos/lumos": "0.23.0",
103+
"@ckb-lumos/rpc": "0.23.0"
97104
}
98105
}

yarn.lock

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,17 +1439,17 @@
14391439
"@babel/plugin-transform-modules-commonjs" "^7.27.1"
14401440
"@babel/plugin-transform-typescript" "^7.27.1"
14411441

1442-
"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
1442+
"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
14431443
version "7.27.0"
14441444
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762"
14451445
integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==
14461446
dependencies:
14471447
regenerator-runtime "^0.14.0"
14481448

1449-
"@babel/runtime@^7.27.6":
1450-
version "7.28.4"
1451-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
1452-
integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
1449+
"@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9":
1450+
version "7.29.2"
1451+
resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.29.2.tgz#9a6e2d05f4b6692e1801cd4fb176ad823930ed5e"
1452+
integrity sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==
14531453

14541454
"@babel/template@^7.22.15":
14551455
version "7.22.15"
@@ -9853,16 +9853,9 @@ husky@8.0.3:
98539853
resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
98549854
integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
98559855

9856-
i18next@21.10.0:
9857-
version "21.10.0"
9858-
resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.10.0.tgz#85429af55fdca4858345d0e16b584ec29520197d"
9859-
integrity sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==
9860-
dependencies:
9861-
"@babel/runtime" "^7.17.2"
9862-
98639856
i18next@23.7.11:
98649857
version "23.7.11"
9865-
resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.11.tgz#ee4dfa58f9b27807ebf57d7c33a6c4a0bb4bf7c8"
9858+
resolved "https://registry.npmmirror.com/i18next/-/i18next-23.7.11.tgz#ee4dfa58f9b27807ebf57d7c33a6c4a0bb4bf7c8"
98669859
integrity sha512-A/vOkw8vY99YHU9A1Td3I1dcTiYaPnwBWzrpVzfXUXSYgogK3cmBcmop/0cnXPc6QpUWIyqaugKNxRUEZVk9Nw==
98679860
dependencies:
98689861
"@babel/runtime" "^7.23.2"
@@ -12484,7 +12477,7 @@ node-addon-api@^6.0.0:
1248412477

1248512478
node-fetch@2.6.13, node-fetch@2.6.7, node-fetch@^2.6.11, node-fetch@^2.6.7:
1248612479
version "2.6.13"
12487-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.13.tgz#a20acbbec73c2e09f9007de5cda17104122e0010"
12480+
resolved "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.6.13.tgz#a20acbbec73c2e09f9007de5cda17104122e0010"
1248812481
integrity sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==
1248912482
dependencies:
1249012483
whatwg-url "^5.0.0"
@@ -14188,12 +14181,12 @@ react-dom@18.3.1:
1418814181
dependencies:
1418914182
scheduler "^0.25.0"
1419014183

14191-
react-i18next@13.5.0, react-i18next@>=11.16.4:
14192-
version "15.7.3"
14193-
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-15.7.3.tgz#2eba235247dff0cbf9f0338e2ab85e10e127aa54"
14194-
integrity sha512-AANws4tOE+QSq/IeMF/ncoHlMNZaVLxpa5uUGW1wjike68elVYr0018L9xYoqBr1OFO7G7boDPrbn0HpMCJxTw==
14184+
react-i18next@14.1.3:
14185+
version "14.1.3"
14186+
resolved "https://registry.npmmirror.com/react-i18next/-/react-i18next-14.1.3.tgz#85525c4294ef870ddd3f5d184e793cae362f47cb"
14187+
integrity sha512-wZnpfunU6UIAiJ+bxwOiTmBOAaB14ha97MjOEnLGac2RJ+h/maIYXZuTHlmyqQVX1UVHmU1YDTQ5vxLmwfXTjw==
1419514188
dependencies:
14196-
"@babel/runtime" "^7.27.6"
14189+
"@babel/runtime" "^7.23.9"
1419714190
html-parse-stringify "^3.0.1"
1419814191

1419914192
react-inspector@6.0.2:
@@ -14218,7 +14211,7 @@ react-is@^17.0.0, react-is@^17.0.1, react-is@^17.0.2:
1421814211

1421914212
react-refresh@0.17.0, react-refresh@^0.17.0:
1422014213
version "0.17.0"
14221-
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.17.0.tgz#b7e579c3657f23d04eccbe4ad2e58a8ed51e7e53"
14214+
resolved "https://registry.npmmirror.com/react-refresh/-/react-refresh-0.17.0.tgz#b7e579c3657f23d04eccbe4ad2e58a8ed51e7e53"
1422214215
integrity sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==
1422314216

1422414217
react-router-dom@6.21.1:
@@ -14450,7 +14443,7 @@ regenerator-runtime@^0.13.7:
1445014443

1445114444
regenerator-runtime@^0.14.0:
1445214445
version "0.14.1"
14453-
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
14446+
resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
1445414447
integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
1445514448

1445614449
regex-not@^1.0.0, regex-not@^1.0.2:

0 commit comments

Comments
 (0)