Skip to content

Commit

Permalink
chore(deps): update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Ohh-889 committed Sep 7, 2024
1 parent 0b14deb commit 1dad4f0
Show file tree
Hide file tree
Showing 6 changed files with 478 additions and 254 deletions.
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@sa/simple-router": "workspace:*",
"@sa/utils": "workspace:*",
"ahooks": "3.8.1",
"antd": "5.20.3",
"antd": "5.20.5",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"echarts": "5.5.1",
Expand All @@ -79,44 +79,44 @@
"typeit": "8.8.4"
},
"devDependencies": {
"@iconify/json": "2.2.241",
"@iconify/json": "2.2.245",
"@iconify/types": "2.0.0",
"@ohh-889/react-auto-route": "0.3.2",
"@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.4.0",
"@soybeanjs/eslint-config": "1.4.1",
"@svgr/core": "8.1.0",
"@svgr/plugin-jsx": "8.1.0",
"@types/gradient-string": "1.1.6",
"@types/node": "22.5.0",
"@types/node": "22.5.4",
"@types/nprogress": "0.2.3",
"@types/react": "18.3.4",
"@types/react": "18.3.5",
"@types/react-beautiful-dnd": "13.1.8",
"@types/react-dom": "18.3.0",
"@types/react-transition-group": "4.4.11",
"@typescript-eslint/eslint-plugin": "8.3.0",
"@typescript-eslint/parser": "8.3.0",
"@typescript-eslint/eslint-plugin": "8.4.0",
"@typescript-eslint/parser": "8.4.0",
"@unocss/eslint-config": "0.62.3",
"@unocss/preset-icons": "0.62.3",
"@unocss/preset-uno": "0.62.3",
"@unocss/transformer-variant-group": "0.62.3",
"@unocss/vite": "0.62.3",
"@vitejs/plugin-react": "4.3.1",
"boxen": "8.0.1",
"eslint": "9.9.1",
"eslint-plugin-react": "7.35.0",
"eslint": "9.10.0",
"eslint-plugin-react": "7.35.2",
"eslint-plugin-react-hooks": "4.6.2",
"eslint-plugin-react-refresh": "0.4.11",
"gradient-string": "2.0.2",
"json5": "2.2.3",
"lint-staged": "15.2.9",
"sass": "1.77.8",
"lint-staged": "15.2.10",
"sass": "1.78.0",
"simple-git-hooks": "2.11.1",
"tsx": "4.18.0",
"tsx": "4.19.0",
"typescript": "5.5.4",
"unplugin-auto-import": "0.18.2",
"unplugin-icons": "0.19.2",
"vite": "5.4.2",
"unplugin-icons": "0.19.3",
"vite": "5.4.3",
"vite-plugin-inspect": "0.8.7",
"vite-plugin-remove-console": "2.2.0",
"vite-plugin-svg-icons": "2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/axios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@sa/utils": "workspace:*",
"axios": "1.7.5",
"axios": "1.7.7",
"axios-retry": "4.5.0",
"qs": "6.13.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"@soybeanjs/changelog": "0.3.24",
"@types/yargs": "17.0.33",
"bumpp": "9.5.2",
"c12": "1.11.1",
"c12": "1.11.2",
"cac": "6.7.14",
"consola": "3.2.3",
"enquirer": "2.4.1",
"execa": "9.3.1",
"kolorist": "1.8.0",
"npm-check-updates": "17.1.0",
"npm-check-updates": "17.1.1",
"rimraf": "6.0.1",
"yargs": "17.7.2"
}
Expand Down
2 changes: 2 additions & 0 deletions packages/simple-router/src/matcher/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class CreateRouterMatcher {
fullPath = generatePath(matcher.record.path, params);
query = location.query || {};
const queryParams = stringifyQuery(query);

fullPath += queryParams ? `?${queryParams}` : '';
path = matcher.record.path;
component = matcher.record.component;
Expand All @@ -160,6 +161,7 @@ class CreateRouterMatcher {

// matcher should have a value after the loop
query = getQueryParams(location.search);

if (matcher) {
name = matcher.record.name;
fullPath = location.pathname + location.search;
Expand Down
1 change: 1 addition & 0 deletions packages/simple-router/src/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ class CreateRouter {
#afterRouteChange = (state: RouterState, afterEach: RouterOptions['afterEach']) => {
if (state.navigation.state === 'idle') {
const from = this.currentRoute;

this.currentRoute = this.resolve(state.location);

afterEach(this.currentRoute, from);
Expand Down
Loading

0 comments on commit 1dad4f0

Please sign in to comment.