Merge pull request #164 from chengpeiquan/develop

Develop

.editorconfig

@@ -0,0 +1,15 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false

src/App.vue

@@ -8,7 +8,7 @@
 import { computed, provide, ref, watchEffect } from 'vue'
 import { useHead } from '@vueuse/head'
 import { useRoute } from 'vue-router'
-import config from '/@/config'
+import config from '@/config'
 import { get } from '@vueuse/core'
 
 const route = useRoute()

src/components/ChildrenList.vue

@@ -76,8 +76,8 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
-import isDev from '/@libs/isDev'
-import isMobile from '/@libs/isMobile'
+import isDev from '@libs/isDev'
+import isMobile from '@libs/isMobile'
 
 interface Children {
   id?: number

src/components/Footer.vue

@@ -29,8 +29,8 @@
 
 <script setup lang="ts">
 import { ref, inject, watchEffect } from 'vue'
-import config from '/@/config'
-import isMobile from '/@libs/isMobile'
+import config from '@/config'
+import isMobile from '@libs/isMobile'
 
 const name = ref<string>('')
 const icp = ref<string>('')

src/components/Header.vue

@@ -156,9 +156,9 @@
 <script setup lang="ts">
 import { ref, inject, watchEffect } from 'vue'
 import { useRouter } from 'vue-router'
-import isDark from '/@libs/isDark'
-import isMobile from '/@libs/isMobile'
-import config from '/@/config'
+import isDark from '@libs/isDark'
+import isMobile from '@libs/isMobile'
+import config from '@/config'
 
 interface NavList {
   path: string

src/components/ToggleTheme.vue

@@ -15,7 +15,7 @@
 
 <script setup lang="ts">
 import { inject } from 'vue'
-import isDark from '/@libs/isDark'
+import isDark from '@libs/isDark'
 
 const lang: string = inject('lang') || ''
 

src/components/blog/Article.vue

@@ -98,9 +98,9 @@ import { onMounted, ref, inject, computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { isClient } from '@vueuse/core'
 import { useHead } from '@vueuse/head'
-import config from '/@/config'
-import dateDisplay from '/@libs/dateDisplay'
-import isMobile from '/@libs/isMobile'
+import config from '@/config'
+import dateDisplay from '@libs/dateDisplay'
+import isMobile from '@libs/isMobile'
 
 const route = useRoute()
 const router = useRouter()

src/components/blog/Detail.vue

@@ -27,7 +27,7 @@
 
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
-import isArticle from '/@libs/isArticle'
+import isArticle from '@libs/isArticle'
 
 const route = useRoute()
 const isUseArticle = isArticle(route)

src/components/blog/List.vue

@@ -135,12 +135,12 @@
 import { reactive, ref, inject } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import type { RouteRecordRaw } from 'vue-router'
-import { categories } from '/@/router/categories'
-import isArticle from '/@libs/isArticle'
 import { useHead } from '@vueuse/head'
-import config from '/@/config'
-import dateDisplay from '/@libs/dateDisplay'
-import isDev from '/@libs/isDev'
+import { categories } from '@/router/categories'
+import isArticle from '@libs/isArticle'
+import config from '@/config'
+import dateDisplay from '@libs/dateDisplay'
+import isDev from '@libs/isDev'
 
 interface List {
   path: string

src/components/blog/Page.vue

@@ -31,7 +31,7 @@
 <script setup lang="ts">
 import { computed, inject } from 'vue'
 import { useHead } from '@vueuse/head'
-import config from '/@/config'
+import config from '@/config'
 
 const lang: string = inject('lang') || ''
 const props = defineProps({

src/components/blog/Sidebar.vue

@@ -132,10 +132,10 @@
 import { onMounted, ref } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { isClient } from '@vueuse/core'
-import isArticle from '/@libs/isArticle'
-import shuffle from '/@libs/shuffle'
-import isMobile from '/@libs/isMobile'
-import isDev from '/@libs/isDev'
+import isArticle from '@libs/isArticle'
+import shuffle from '@libs/shuffle'
+import isMobile from '@libs/isMobile'
+import isDev from '@libs/isDev'
 
 interface List {
   path: string

src/libs/dateDisplay.ts

@@ -1,7 +1,7 @@
 /**
  * 计算一些日期的显示
  */
-import dayjs from '/@libs/dayjs'
+import dayjs from '@libs/dayjs'
 
 interface DateInfo {
   diffDays: number

src/libs/isArticle.ts

@@ -4,7 +4,7 @@
  * @param {string} lang - 语言缩写， e.g. en, zh-CN
  */
 import { RouteRecordRaw } from 'vue-router'
-import config from '/@/config'
+import config from '@/config'
 
 const { defaultLang } = config
 

src/main.ts

@@ -9,15 +9,15 @@ import '@purge-icons/generated'
 /**
  * 导入本地依赖
  */
-import { routes, scrollBehavior } from '/@/router'
-import App from '/@/App.vue'
+import { routes, scrollBehavior } from '@/router'
+import App from '@/App.vue'
 
 /**
  * 导入全局样式
  */
 import 'windi.css'
-import '/@postcss/global.postcss'
-import '/@postcss/markdown.postcss'
+import '@postcss/global.postcss'
+import '@postcss/markdown.postcss'
 
 /**
  * 创建实例

src/router/categories.ts

@@ -1,4 +1,4 @@
-import config from '/@/config'
+import config from '@/config'
 
 let routes: any[] = []
 const { defaultLang, i18n } = config

src/views/[...all].vue

@@ -24,7 +24,7 @@ import { ref, inject } from 'vue'
 import { onBeforeRouteLeave, useRouter } from 'vue-router'
 import { useHead } from '@vueuse/head'
 import { isClient } from '@vueuse/core'
-import config from '/@/config'
+import config from '@/config'
 
 const router = useRouter()
 const seconds = ref<number>(10)

src/views/en/[...all].vue

@@ -20,7 +20,7 @@
 import { useHead } from '@vueuse/head'
 import { isClient } from '@vueuse/core'
 import { ref, inject } from 'vue'
-import config from '/@/config'
+import config from '@/config'
 import { onBeforeRouteLeave, useRouter } from 'vue-router'
 
 const router = useRouter()

src/views/en/index.vue

@@ -22,7 +22,7 @@
 <script setup lang="ts">
 import { inject } from 'vue'
 import { useHead } from '@vueuse/head'
-import config from '/@/config'
+import config from '@/config'
 
 const lang: string = inject('lang') || ''
 

src/views/index.vue

@@ -22,7 +22,7 @@
 <script setup lang="ts">
 import { inject } from 'vue'
 import { useHead } from '@vueuse/head'
-import config from '/@/config'
+import config from '@/config'
 
 const lang: string = inject('lang') || ''
 

tsconfig.json

@@ -1,79 +1,64 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "strict": true,
-    "jsx": "preserve",
-    "importHelpers": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "forceConsistentCasingInFileNames": true,
-    "experimentalDecorators": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "incremental": true,
-    "allowSyntheticDefaultImports": true,
-    "sourceMap": true,
-    "baseUrl": "./",
-    "types": [
-      "vite/client",
-      "node",
-      "vite-plugin-pages/client",
-      "vite-plugin-pwa/client"
-    ],
-    "paths": {
-      "/@/*": [
-        "src/*"
-      ],
-      "/@img/*": [
-        "src/assets/img/*"
-      ],
-      "/@styl/*": [
-        "src/assets/styl/*"
-      ],
-      "/@js/*": [
-        "src/assets/js/*"
-      ],
-      "/@ts/*": [
-        "src/assets/ts/*"
-      ],
-      "/@fonts/*": [
-        "src/assets/fonts/*"
-      ],
-      "/@css/*": [
-        "src/assets/css/*"
-      ],
-      "/@libs/*": [
-        "src/libs/*"
-      ],
-      "/@cp/*": [
-        "src/components/*"
-      ],
-      "/@views/*": [
-        "src/views/*"
-      ],
-      "/@plugins/*": [
-        "src/plugins/*"
-      ]
-    },
-    "lib": [
-      "esnext",
-      "dom"
-    ],
-    "plugins": [
-      {
-        "name": "@vuedx/typescript-plugin-vue"
-      }
-    ]
-  },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.d.ts",
-    "src/**/*.tsx",
-    "src/**/*.vue"
-  ],
-  "exclude": [
-    "dist",
-    "node_modules"
-  ]
-}
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "strict": true,
+    "jsx": "preserve",
+    "importHelpers": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "forceConsistentCasingInFileNames": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "incremental": true,
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true,
+    "baseUrl": "./",
+    "types": [
+      "vite/client",
+      "node",
+      "vite-plugin-pages/client",
+      "vite-plugin-pwa/client"
+    ],
+    "paths": {
+      "@/*": [
+        "src/*"
+      ],
+      "@img/*": [
+        "src/assets/img/*"
+      ],
+      "@postcss/*": [
+        "src/assets/postcss/*"
+      ],
+      "@libs/*": [
+        "src/libs/*"
+      ],
+      "@cp/*": [
+        "src/components/*"
+      ],
+      "@views/*": [
+        "src/views/*"
+      ]
+    },
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    "plugins": [
+      {
+        "name": "@vuedx/typescript-plugin-vue"
+      }
+    ]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue"
+  ],
+  "exclude": [
+    "dist",
+    "node_modules"
+  ]
+}

vite.config.ts

@@ -38,13 +38,12 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      '/@': resolve('src'),
-      '/@img': resolve('src/assets/img'),
-      '/@postcss': resolve('src/assets/postcss'),
-      '/@ts': resolve('src/assets/ts'),
-      '/@libs': resolve('src/libs'),
-      '/@cp': resolve('src/components'),
-      '/@views': resolve('src/views'),
+      '@': resolve('src'),
+      '@img': resolve('src/assets/img'),
+      '@postcss': resolve('src/assets/postcss'),
+      '@libs': resolve('src/libs'),
+      '@cp': resolve('src/components'),
+      '@views': resolve('src/views'),
     },
   },
   optimizeDeps: {