chore(projects): update deps & fix vue-router type

This commit is contained in:
Soybean 2024-08-01 00:06:00 +08:00
parent cb1d44525d
commit 968370b1aa
5 changed files with 421 additions and 2143 deletions

View File

@ -62,25 +62,25 @@
"nprogress": "0.2.0",
"pinia": "2.2.0",
"tailwind-merge": "2.4.0",
"vue": "3.4.34",
"vue": "3.4.35",
"vue-draggable-plus": "0.5.2",
"vue-i18n": "9.13.1",
"vue-router": "4.4.0"
"vue-router": "4.4.1"
},
"devDependencies": {
"@elegant-router/vue": "0.3.7",
"@elegant-router/vue": "0.3.8",
"@iconify/json": "2.2.232",
"@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.3.7",
"@types/node": "22.0.0",
"@soybeanjs/eslint-config": "1.4.0",
"@types/node": "22.0.1",
"@types/nprogress": "0.2.3",
"@unocss/eslint-config": "0.61.7",
"@unocss/preset-icons": "0.61.7",
"@unocss/preset-uno": "0.61.7",
"@unocss/transformer-directives": "0.61.7",
"@unocss/transformer-variant-group": "0.61.7",
"@unocss/vite": "0.61.7",
"@unocss/eslint-config": "0.61.9",
"@unocss/preset-icons": "0.61.9",
"@unocss/preset-uno": "0.61.9",
"@unocss/transformer-directives": "0.61.9",
"@unocss/transformer-variant-group": "0.61.9",
"@unocss/vite": "0.61.9",
"@vitejs/plugin-vue": "5.1.1",
"@vitejs/plugin-vue-jsx": "4.0.0",
"eslint": "9.8.0",
@ -88,7 +88,7 @@
"lint-staged": "15.2.7",
"sass": "1.77.8",
"simple-git-hooks": "2.11.1",
"tsx": "4.16.2",
"tsx": "4.16.3",
"typescript": "5.5.4",
"unplugin-icons": "0.19.1",
"unplugin-vue-components": "0.27.3",

View File

@ -21,7 +21,7 @@
"enquirer": "2.4.1",
"execa": "9.3.0",
"kolorist": "1.8.0",
"npm-check-updates": "16.14.20",
"npm-check-updates": "17.0.0",
"rimraf": "6.0.1"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -97,10 +97,13 @@ function transformElegantRouteToVueRoute(
if (component) {
if (isSingleLevelRoute(route)) {
const { layout, view } = getSingleLevelRouteComponent(component);
const singleLevelRoute: RouteRecordRaw = {
path,
component: layouts[layout],
meta: {
title: route.meta?.title || ''
},
children: [
{
name,
@ -110,36 +113,35 @@ function transformElegantRouteToVueRoute(
} as RouteRecordRaw
]
};
return [singleLevelRoute];
}
if (isLayout(component)) {
const layoutName = getLayoutName(component);
vueRoute.component = layouts[layoutName];
}
if (isView(component)) {
const viewName = getViewName(component);
vueRoute.component = views[viewName];
}
}
} catch (error: any) {
console.error(`Error transforming route "${route.name}": ${error.toString()}`);
return [];
}
// add redirect to child
if (children?.length && !vueRoute.redirect) {
vueRoute.redirect = {
name: children[0].name
};
}
if (children?.length) {
const childRoutes = children.flatMap(child => transformElegantRouteToVueRoute(child, layouts, views));

View File

@ -37,7 +37,7 @@ declare module "@elegant-router/types" {
/**
* custom route key
*/
*/
export type CustomRouteKey = Extract<
RouteKey,
| "root"
@ -46,7 +46,7 @@ declare module "@elegant-router/types" {
/**
* the generated route key
*/
*/
export type GeneratedRouteKey = Exclude<RouteKey, CustomRouteKey>;
/**