Skip to content

Commit 4edf0c4

Browse files
sunnylqmsunnylqm
committed
update dependencies to latest versions, including @rsbuild/core, react, react-dom, react-router-dom, and add hash-wasm for password hashing
1 parent be43f6c commit 4edf0c4

File tree

6 files changed

+43
-48
lines changed

6 files changed

+43
-48
lines changed

‎bun.lock‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,24 @@
55
"dependencies": {
66
"@ant-design/icons": "^6.0.0",
77
"@ant-design/v5-patch-for-react-19": "^1.0.3",
8-
"@rsbuild/core": "^1.4.10",
8+
"@rsbuild/core": "^1.4.11",
99
"@rsbuild/plugin-react": "^1.3.4",
1010
"@rsbuild/plugin-sass": "^1.3.3",
1111
"@rsbuild/plugin-svgr": "^1.2.1",
1212
"@tanstack/react-query": "^5.83.0",
1313
"antd": "^5.26.6",
14-
"blueimp-md5": "^2.19.0",
1514
"dayjs": "^1.11.13",
1615
"git-url-parse": "^16.1.0",
16+
"hash-wasm": "^4.12.0",
1717
"history": "^5.3.0",
1818
"json-diff-kit": "^1.0.32",
19-
"react": "^19.1.0",
20-
"react-dom": "^19.1.0",
21-
"react-router-dom": "^7.7.0",
19+
"react": "^19.1.1",
20+
"react-dom": "^19.1.1",
21+
"react-router-dom": "^7.7.1",
2222
"vanilla-jsoneditor": "^3.8.0",
2323
},
2424
"devDependencies": {
2525
"@biomejs/biome": "2.1.2",
26-
"@types/blueimp-md5": "^2.18.2",
2726
"@types/git-url-parse": "^16.0.2",
2827
"@types/react": "^19",
2928
"@types/react-dom": "^19",
@@ -216,7 +215,7 @@
216215

217216
"@replit/codemirror-indentation-markers": ["@replit/[email protected]", "", { "peerDependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0" } }, "sha512-hL5Sfvw3C1vgg7GolLe/uxX5T3tmgOA3ZzqlMv47zjU1ON51pzNWiVbS22oh6crYhtVhv8b3gdXwoYp++2ilHw=="],
218217

219-
"@rsbuild/core": ["@rsbuild/[email protected].10", "", { "dependencies": { "@rspack/core": "1.4.10", "@rspack/lite-tapable": "~1.0.1", "@swc/helpers": "^0.5.17", "core-js": "~3.44.0", "jiti": "^2.5.0" }, "bin": { "rsbuild": "bin/rsbuild.js" } }, "sha512-CUy3MyO/XZIn+Dfb0ffwNJr3RA+iUpZFrzCzDwCpM18rbUjVsj5bjTwf1aVcWHMZSpJHX+j8pH02ttGomfeNIQ=="],
218+
"@rsbuild/core": ["@rsbuild/[email protected].11", "", { "dependencies": { "@rspack/core": "1.4.10", "@rspack/lite-tapable": "~1.0.1", "@swc/helpers": "^0.5.17", "core-js": "~3.44.0", "jiti": "^2.5.0" }, "bin": { "rsbuild": "bin/rsbuild.js" } }, "sha512-G5x7jUGxVw0Z984IEKmOP/tW8gslhUjN81D3fuogKb95hlESWpc+LuckuA5iO1ydbLVrhuYKLv1tC8wTAIDsqA=="],
220219

221220
"@rsbuild/plugin-react": ["@rsbuild/[email protected]", "", { "dependencies": { "@rspack/plugin-react-refresh": "~1.4.3", "react-refresh": "^0.17.0" }, "peerDependencies": { "@rsbuild/core": "1.x" } }, "sha512-PeLmPkUUm+t2cBGBe1WHhw1NNPHDFnKiXnRUGM5WSSlSZWfSi96RbeLqrm+gH6TaefdyvmLvurJu+7tSSUrQjQ=="],
222221

@@ -290,8 +289,6 @@
290289

291290
"@tybys/wasm-util": ["@tybys/[email protected]", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ=="],
292291

293-
"@types/blueimp-md5": ["@types/[email protected]", "", {}, "sha512-dJ9yRry9Olt5GAWlgCtE5dK9d/Dfhn/V7hna86eEO2Pn76+E8Y0S0n61iEUEGhWXXgtKtHxtZLVNwL8X+vLHzg=="],
294-
295292
"@types/estree": ["@types/[email protected]", "", {}, "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="],
296293

297294
"@types/git-url-parse": ["@types/[email protected]", "", { "dependencies": { "git-url-parse": "*" } }, "sha512-STa+QaJtPbqwtioDIncRyft1xXrsTIYW0KkS6RS6l++NiDaQxqgsIkNp2Jf9nJ1KnCGPOvWaR1iO+B7LkM8+ew=="],
@@ -340,8 +337,6 @@
340337

341338
"binary-extensions": ["[email protected]", "", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="],
342339

343-
"blueimp-md5": ["[email protected]", "", {}, "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w=="],
344-
345340
"boolbase": ["[email protected]", "", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="],
346341

347342
"brace-expansion": ["[email protected]", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="],
@@ -482,6 +477,8 @@
482477

483478
"has-flag": ["[email protected]", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
484479

480+
"hash-wasm": ["[email protected]", "", {}, "sha512-+/2B2rYLb48I/evdOIhP+K/DD2ca2fgBjp6O+GBEnCDk2e4rpeXIK8GvIyRPjTezgmWn9gmKwkQjjx6BtqDHVQ=="],
481+
485482
"hasown": ["[email protected]", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="],
486483

487484
"history": ["[email protected]", "", { "dependencies": { "@babel/runtime": "^7.7.6" } }, "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ=="],
@@ -732,17 +729,17 @@
732729

733730
"rc-virtual-list": ["[email protected]", "", { "dependencies": { "@babel/runtime": "^7.20.0", "classnames": "^2.2.6", "rc-resize-observer": "^1.0.0", "rc-util": "^5.36.0" }, "peerDependencies": { "react": ">=16.9.0", "react-dom": ">=16.9.0" } }, "sha512-algM5UsB7vrlPNr9lsZEH8s9KHkP8XbT/Y0qylyPkiM8mIOlSJLjBNADcmbYPEQCm4zW82mZRJuVHNzqqN0EAQ=="],
734731

735-
"react": ["[email protected].0", "", {}, "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg=="],
732+
"react": ["[email protected].1", "", {}, "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ=="],
736733

737-
"react-dom": ["[email protected].0", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.0" } }, "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g=="],
734+
"react-dom": ["[email protected].1", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.1" } }, "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw=="],
738735

739736
"react-is": ["[email protected]", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
740737

741738
"react-refresh": ["[email protected]", "", {}, "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ=="],
742739

743-
"react-router": ["[email protected].0", "", { "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" }, "optionalPeers": ["react-dom"] }, "sha512-3FUYSwlvB/5wRJVTL/aavqHmfUKe0+Xm9MllkYgGo9eDwNdkvwlJGjpPxono1kCycLt6AnDTgjmXvK3/B4QGuw=="],
740+
"react-router": ["[email protected].1", "", { "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" }, "optionalPeers": ["react-dom"] }, "sha512-jVKHXoWRIsD/qS6lvGveckwb862EekvapdHJN/cGmzw40KnJH5gg53ujOJ4qX6EKIK9LSBfFed/xiQ5yeXNrUA=="],
744741

745-
"react-router-dom": ["[email protected].0", "", { "dependencies": { "react-router": "7.7.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" } }, "sha512-wwGS19VkNBkneVh9/YD0pK3IsjWxQUVMDD6drlG7eJpo1rXBtctBqDyBm/k+oKHRAm1x9XWT3JFC82QI9YOXXA=="],
742+
"react-router-dom": ["[email protected].1", "", { "dependencies": { "react-router": "7.7.1" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" } }, "sha512-bavdk2BA5r3MYalGKZ01u8PGuDBloQmzpBZVhDLrOOv1N943Wq6dcM9GhB3x8b7AbqPMEezauv4PeGkAJfy7FQ=="],
746743

747744
"read-cache": ["[email protected]", "", { "dependencies": { "pify": "^2.3.0" } }, "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="],
748745

‎package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,24 @@
1010
"dependencies": {
1111
"@ant-design/icons": "^6.0.0",
1212
"@ant-design/v5-patch-for-react-19": "^1.0.3",
13-
"@rsbuild/core": "^1.4.10",
13+
"@rsbuild/core": "^1.4.11",
1414
"@rsbuild/plugin-react": "^1.3.4",
1515
"@rsbuild/plugin-sass": "^1.3.3",
1616
"@rsbuild/plugin-svgr": "^1.2.1",
1717
"@tanstack/react-query": "^5.83.0",
1818
"antd": "^5.26.6",
19-
"blueimp-md5": "^2.19.0",
2019
"dayjs": "^1.11.13",
2120
"git-url-parse": "^16.1.0",
21+
"hash-wasm": "^4.12.0",
2222
"history": "^5.3.0",
2323
"json-diff-kit": "^1.0.32",
24-
"react": "^19.1.0",
25-
"react-dom": "^19.1.0",
26-
"react-router-dom": "^7.7.0",
24+
"react": "^19.1.1",
25+
"react-dom": "^19.1.1",
26+
"react-router-dom": "^7.7.1",
2727
"vanilla-jsoneditor": "^3.8.0"
2828
},
2929
"devDependencies": {
3030
"@biomejs/biome": "2.1.2",
31-
"@types/blueimp-md5": "^2.18.2",
3231
"@types/git-url-parse": "^16.0.2",
3332
"@types/react": "^19",
3433
"@types/react-dom": "^19",

‎src/pages/register.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { api } from "@/services/api";
2-
import { setUserEmail } from "@/services/auth";
3-
import { Button, Checkbox, Form, Input, Row, message } from "antd";
4-
import md5 from "blueimp-md5";
1+
import { Button, Checkbox, Form, Input, message, Row } from "antd";
2+
import { md5 } from "hash-wasm";
53
import { useState } from "react";
64
import { Link } from "react-router-dom";
5+
import { api } from "@/services/api";
6+
import { setUserEmail } from "@/services/auth";
77
import { ReactComponent as Logo } from "../assets/logo.svg";
88
import { rootRouterPath, router } from "../router";
99
import { isPasswordValid } from "../utils/helper";
@@ -14,7 +14,7 @@ export const Register = () => {
1414
async function submit(values: { [key: string]: string }) {
1515
delete values.pwd2;
1616
delete values.agreed;
17-
values.pwd = md5(values.pwd);
17+
values.pwd = await md5(values.pwd);
1818
setLoading(true);
1919
try {
2020
await api.register(values);

‎src/pages/reset-password/components/set-password.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { api } from "@/services/api";
21
import { Button, Form, Input, message } from "antd";
3-
import md5 from "blueimp-md5";
2+
import { md5 } from "hash-wasm";
43
import { useState } from "react";
54
import { useLocation } from "react-router-dom";
5+
import { api } from "@/services/api";
66
import { rootRouterPath, router } from "../../../router";
77
import { isPasswordValid } from "../../../utils/helper";
88

@@ -17,7 +17,7 @@ export default function SetPassword() {
1717
try {
1818
await api.resetPwd({
1919
token: new URLSearchParams(search).get("code") ?? "",
20-
newPwd: md5(values.newPwd),
20+
newPwd: await md5(values.newPwd),
2121
});
2222
router.navigate(rootRouterPath.resetPassword("3"));
2323
} catch (e) {
@@ -37,8 +37,8 @@ export default function SetPassword() {
3737
if (value && !isPasswordValid(value)) {
3838
return Promise.reject(
3939
new Error(
40-
"密码中需要同时包含大、小写字母和数字，且长度不少于6位",
41-
),
40+
"密码中需要同时包含大、小写字母和数字，且长度不少于6位"
41+
)
4242
);
4343
}
4444
return Promise.resolve();

‎src/services/auth.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
/* eslint-disable @typescript-eslint/naming-convention */
2+
import { message } from "antd";
3+
import { md5 } from "hash-wasm";
14
import { rootRouterPath, router } from "@/router";
25
import { api } from "@/services/api";
36
import { setToken } from "@/services/request";
4-
/* eslint-disable @typescript-eslint/naming-convention */
5-
import { message } from "antd";
6-
import md5 from "blueimp-md5";
77

88
let _email = "";
99
export const setUserEmail = (email: string) => {
@@ -14,14 +14,14 @@ export const getUserEmail = () => _email;
1414

1515
export async function login(email: string, password: string) {
1616
_email = email;
17-
const params = { email, pwd: md5(password) };
17+
const params = { email, pwd: await md5(password) };
1818
try {
1919
const res = await api.login(params);
2020
if (res?.token) {
2121
setToken(res.token);
2222
message.success("登录成功");
2323
const loginFrom = new URLSearchParams(window.location.search).get(
24-
"loginFrom",
24+
"loginFrom"
2525
);
2626
router.navigate(loginFrom || rootRouterPath.user);
2727
}

‎src/services/request.ts‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { message } from "antd";
2-
import { logout } from "./auth";
32
import { testUrls } from "@/utils/helper";
3+
import { logout } from "./auth";
44

55
// eslint-disable-next-line @typescript-eslint/naming-convention
66
let _token = localStorage.getItem("token");
@@ -16,25 +16,24 @@ const SERVER = {
1616
main: [
1717
"https://update.react-native.cn/api",
1818
"https://update.reactnative.cn/api",
19-
"https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run",
2019
],
2120
};
2221

2322
// const baseUrl = `http://localhost:9000`;
2423
// let baseUrl = SERVER.main[0];
2524
// const baseUrl = `https://p.reactnative.cn/api`;
26-
// const baseUrl = `http://k.reactnative.cn/api`;
2725

2826
const getBaseUrl = (async () => {
29-
return testUrls(SERVER.main.map((url) => `${url}/status`)).then((ret) => {
30-
let baseUrl = SERVER.main[0];
31-
if (ret) {
32-
// remove /status
33-
baseUrl = ret.replace("/status", "");
34-
}
35-
console.log("baseUrl", baseUrl);
36-
return baseUrl;
37-
});
27+
return SERVER.main[0];
28+
// return testUrls(SERVER.main.map((url) => `${url}/status`)).then((ret) => {
29+
// let baseUrl = SERVER.main[0];
30+
// if (ret) {
31+
// // remove /status
32+
// baseUrl = ret.replace("/status", "");
33+
// }
34+
// console.log("baseUrl", baseUrl);
35+
// return baseUrl;
36+
// });
3837
})();
3938

4039
interface PushyResponse {

0 commit comments

Comments
 (0)