Skip to content

Commit

Permalink
tsconfig path
Browse files Browse the repository at this point in the history
  • Loading branch information
hanaTsuk1 committed Oct 31, 2023
1 parent e390543 commit 44e256a
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/components/form/FormFactory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useField, useForm } from 'vee-validate'
import { toTypedSchema } from '@vee-validate/zod'
import { z } from 'zod'
import type { BuildSchemaObject, Form } from '@interfaces/index'
import type { BuildSchemaObject, Form } from '@/interfaces'
const props = defineProps<{
form: Form
Expand Down
2 changes: 1 addition & 1 deletion src/components/notification/NotificationContainer.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { Notification, NotificationGroup } from '@plugins/notiwind'
import { Notification, NotificationGroup } from '@/plugins/notiwind'
</script>

<template>
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useConfirmModal.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { UseModalOptions } from 'vue-final-modal'
import { useModal } from 'vue-final-modal'

import ConfirmModal from '@components/modal/ConfirmModal.vue'
import type { ComponentProps } from '@interfaces/index'
import ConfirmModal from '@/components/modal/ConfirmModal.vue'
import type { ComponentProps } from '@/interfaces'

export function useFormModal(options: UseModalOptions<ComponentProps<typeof ConfirmModal>>) {
return useModal({
Expand Down
8 changes: 5 additions & 3 deletions src/hooks/useFormModal.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import type { UseModalOptions } from 'vue-final-modal'
import { useModal } from 'vue-final-modal'

import FormModal from '@components/modal/FormModal.vue'
import type { ComponentProps } from '@interfaces/index'
import FormModal from '@/components/modal/FormModal.vue'
import type { ComponentProps } from '@/interfaces'

export function useFormModal(options: UseModalOptions<ComponentProps<typeof FormModal>>) {
export type useFormModalOptions = UseModalOptions<ComponentProps<typeof FormModal>>

export function useFormModal(options: useFormModalOptions) {
return useModal({
component: FormModal,
...options,
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/useNotify.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { NotificationSchema } from '@plugins/notiwind'
import { notify } from '@plugins/notiwind'
import { i18n } from '@locales/index'
import type { NotificationSchema } from '@/plugins/notiwind'
import { notify } from '@/plugins/notiwind'
import { i18n } from '@/locales'

type Notify = typeof notify

Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export interface Menu {
click?: Function
}

export * from '@components/modal/types'
export * from '@/components/modal/types'
10 changes: 5 additions & 5 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import { createVfm } from 'vue-final-modal'

import VChart from 'vue-echarts'

import { i18n } from '@locales/index'
import { vuetify } from '@plugins/vuetify'
import '@plugins/zod'
import '@plugins/echarts'

import App from './App.vue'
import routes from '~pages'

import { i18n } from '@/locales'
import { vuetify } from '@/plugins/vuetify'
import '@/plugins/zod'
import '@/plugins/echarts'

const router = createRouter({
history: createWebHashHistory(),
routes,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { format as _format, formatDistance as _formatDistance, formatDistanceStrict as _formatDistanceStrict, formatDuration as _formatDuration, endOfMonth, startOfMonth } from 'date-fns'
import { enUS, zhCN } from 'date-fns/locale'

import { i18n } from '@locales/index'
import { i18n } from '@/locales'

export * from './path'

Expand Down
7 changes: 1 addition & 6 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@
],
"baseUrl": "./",
"paths": {
"@locales/*": ["src/locales/*"],
"@interfaces/*": ["src/interfaces/*"],
"@assets/*": ["src/assets/*"],
"@modules/*": ["src/modules/*"],
"@components/*": ["src/components/*"],
"@plugins/*": ["src/plugins/*"]
"@/*": ["src/*"]
}
},
"include": [
Expand Down

0 comments on commit 44e256a

Please sign in to comment.