From 6e60e30b2df7c7a1f31f0e9c25d75c6bdc8d2311 Mon Sep 17 00:00:00 2001 From: mnenie <121057011+mneniee@users.noreply.github.com> Date: Wed, 25 Dec 2024 02:02:34 +0300 Subject: [PATCH] fix(uvr): auto-generate component names in compilation --- core/client/src/app/providers/router/index.ts | 6 +++--- core/client/src/pages/boards/[id].vue | 2 +- .../widgets/layout/ui/sidebar/ProjectsList.vue | 2 +- core/client/typed-router.d.ts | 2 +- core/client/vite.config.ts | 15 ++++++++++++++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/core/client/src/app/providers/router/index.ts b/core/client/src/app/providers/router/index.ts index 94f1fe4d..6798d93b 100644 --- a/core/client/src/app/providers/router/index.ts +++ b/core/client/src/app/providers/router/index.ts @@ -10,9 +10,9 @@ export const router = createRouter({ router.beforeEach((to, from) => { // Needs to add guard auth logic in router - if (to.meta.requiresAuth === true) { - return router.push({ name: 'sign-in' }) - } + // if (to.meta.requiresAuth === true) { + // return router.push({ name: 'sign-in' }) + // } }) router.beforeEach(layoutResolverMiddleware) diff --git a/core/client/src/pages/boards/[id].vue b/core/client/src/pages/boards/[id].vue index becce2d8..a8066c69 100644 --- a/core/client/src/pages/boards/[id].vue +++ b/core/client/src/pages/boards/[id].vue @@ -33,7 +33,7 @@ definePage({ meta: { requiresAuth: true, }, - name: 'board', + name: 'board-id', }) diff --git a/core/client/src/widgets/layout/ui/sidebar/ProjectsList.vue b/core/client/src/widgets/layout/ui/sidebar/ProjectsList.vue index 7cf129fa..74421404 100644 --- a/core/client/src/widgets/layout/ui/sidebar/ProjectsList.vue +++ b/core/client/src/widgets/layout/ui/sidebar/ProjectsList.vue @@ -12,7 +12,7 @@ const props = defineProps<{ const showList = ref(true) const showPlusIcon = ref(false) -const route = useRoute('board') +const route = useRoute('board-id') const _projects = computed(() => { return props.boards.map(proj => ({ diff --git a/core/client/typed-router.d.ts b/core/client/typed-router.d.ts index e7d24d34..ee0e2a02 100644 --- a/core/client/typed-router.d.ts +++ b/core/client/typed-router.d.ts @@ -26,7 +26,7 @@ declare module 'vue-router/auto-routes' { 'confirm': RouteRecordInfo<'confirm', '/auth/sign-up/confirm', Record, Record>, 'workspace': RouteRecordInfo<'workspace', '/auth/sign-up/workspace', Record, Record>, 'boards': RouteRecordInfo<'boards', '/boards', Record, Record>, - 'board': RouteRecordInfo<'board', '/boards/:id', { id: ParamValue }, { id: ParamValue }>, + 'board-id': RouteRecordInfo<'board-id', '/boards/:id', { id: ParamValue }, { id: ParamValue }>, 'members': RouteRecordInfo<'members', '/members', Record, Record>, 'settings': RouteRecordInfo<'settings', '/settings', Record, Record>, 'tasks': RouteRecordInfo<'tasks', '/tasks', Record, Record>, diff --git a/core/client/vite.config.ts b/core/client/vite.config.ts index 4a9b8d9f..60aba652 100644 --- a/core/client/vite.config.ts +++ b/core/client/vite.config.ts @@ -1,17 +1,30 @@ +import type { TreeNode } from 'unplugin-vue-router' import { fileURLToPath, URL } from 'node:url' import vue from '@vitejs/plugin-vue' import UnoCSS from 'unocss/vite' +import { getNuxtStyleRouteName } from 'unplugin-vue-router-extend' +import UnpluginVueRouterExtend from 'unplugin-vue-router-extend/vite' import UnpluginVueRouter from 'unplugin-vue-router/vite' import { defineConfig } from 'vite' import vueDevTools from 'vite-plugin-vue-devtools' -// https://vitejs.dev/config/ +const routeMap = new Map() export default defineConfig({ plugins: [ UnpluginVueRouter({ + getRouteName: (node: TreeNode) => { + if (!routeMap.size) { + for (const [key, value] of (node.parent as any)?.map) + routeMap.set(key, value) + } + return getNuxtStyleRouteName(node) + }, routesFolder: ['src/pages'], dts: './typed-router.d.ts', }), + UnpluginVueRouterExtend({ + routeMap, + }), vueDevTools(), UnoCSS(), vue(),