Skip to content

Commit 9004c13

Browse files
authored
Merge branch 'develop' into dependabot/npm_and_yarn/vite-6.4.1
2 parents 4768471 + 83c019a commit 9004c13

File tree

4 files changed

+17
-26
lines changed

4 files changed

+17
-26
lines changed

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.202.1",
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: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,14 +1439,14 @@
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.23.2", "@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":
1449+
"@babel/runtime@^7.23.9":
14501450
version "7.28.4"
14511451
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
14521452
integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
@@ -9804,13 +9804,6 @@ husky@8.0.3:
98049804
resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
98059805
integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
98069806

9807-
i18next@21.10.0:
9808-
version "21.10.0"
9809-
resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.10.0.tgz#85429af55fdca4858345d0e16b584ec29520197d"
9810-
integrity sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==
9811-
dependencies:
9812-
"@babel/runtime" "^7.17.2"
9813-
98149807
i18next@23.7.11:
98159808
version "23.7.11"
98169809
resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.11.tgz#ee4dfa58f9b27807ebf57d7c33a6c4a0bb4bf7c8"
@@ -14101,14 +14094,13 @@ react-dom@18.3.1:
1410114094
dependencies:
1410214095
scheduler "^0.25.0"
1410314096

14104-
react-i18next@13.5.0, react-i18next@>=11.16.4:
14105-
version "16.2.3"
14106-
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-16.2.3.tgz#079e3c54c85334ce9ab9732be3553516a7b7b42d"
14107-
integrity sha512-O0t2zvmIz7nHWKNfIL+O/NTIbpTaOPY0vZov779hegbep3IZ+xcqkeVPKWBSXwzdkiv77q8zmq9toKIUys1x3A==
14097+
react-i18next@14.1.3:
14098+
version "14.1.3"
14099+
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.1.3.tgz#85525c4294ef870ddd3f5d184e793cae362f47cb"
14100+
integrity sha512-wZnpfunU6UIAiJ+bxwOiTmBOAaB14ha97MjOEnLGac2RJ+h/maIYXZuTHlmyqQVX1UVHmU1YDTQ5vxLmwfXTjw==
1410814101
dependencies:
14109-
"@babel/runtime" "^7.27.6"
14102+
"@babel/runtime" "^7.23.9"
1411014103
html-parse-stringify "^3.0.1"
14111-
use-sync-external-store "^1.6.0"
1411214104

1411314105
react-inspector@6.0.2:
1411414106
version "6.0.2"
@@ -16404,11 +16396,6 @@ usb@2.9.0:
1640416396
node-addon-api "^6.0.0"
1640516397
node-gyp-build "^4.5.0"
1640616398

16407-
use-sync-external-store@^1.6.0:
16408-
version "1.6.0"
16409-
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
16410-
integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==
16411-
1641216399
use@^3.1.0:
1641316400
version "3.1.1"
1641416401
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"

0 commit comments

Comments
 (0)