From ef15f04a83f32b7e795bbb3f1e328b298c3b0557 Mon Sep 17 00:00:00 2001
From: bingling-sama <bingling_sama@qq.com>
Date: Mon, 29 Jul 2024 21:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(alias):=20fix=20alias=20erro?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vitepress/theme/analyzers/mcla.ts            |  2 +-
 .vitepress/theme/components/AuthRedirect.vue  |  2 +-
 .vitepress/theme/components/LogViewer.vue     |  2 +-
 .../theme/components/ResponsibleEditor.vue    | 15 +------
 .vitepress/theme/configs/vite.ts              |  8 ++--
 .vitepress/theme/layouts/Posts.vue            |  2 +-
 pnpm-lock.yaml                                | 41 +++++++++++++++++++
 tsconfig.json                                 |  6 ---
 8 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/.vitepress/theme/analyzers/mcla.ts b/.vitepress/theme/analyzers/mcla.ts
index 104ce93..c63c7e5 100644
--- a/.vitepress/theme/analyzers/mcla.ts
+++ b/.vitepress/theme/analyzers/mcla.ts
@@ -1,5 +1,5 @@
 import type { Ref } from "vue"
-import { useCDN } from "@theme/utils/cdn"
+import { useCDN } from "@/theme/utils/cdn"
 
 export { VERSION, MCLA_GH_DB_PREFIX, loadMCLA }
 
diff --git a/.vitepress/theme/components/AuthRedirect.vue b/.vitepress/theme/components/AuthRedirect.vue
index d527c80..27ee5de 100644
--- a/.vitepress/theme/components/AuthRedirect.vue
+++ b/.vitepress/theme/components/AuthRedirect.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue"
-import { onAuthDone } from "@theme/auth/github"
+import { onAuthDone } from "@/theme/auth/github"
 
 const REDIRECT_TIMEOUT_SEC = 3
 
diff --git a/.vitepress/theme/components/LogViewer.vue b/.vitepress/theme/components/LogViewer.vue
index 83388b5..71de45b 100644
--- a/.vitepress/theme/components/LogViewer.vue
+++ b/.vitepress/theme/components/LogViewer.vue
@@ -5,7 +5,7 @@ import {
 	getAuthToken,
 	expireAuthToken,
 	redirectToAuth,
-} from "@theme/auth/github"
+} from "@/theme/auth/github"
 
 const loading = ref(true)
 const errorStr = ref("")
diff --git a/.vitepress/theme/components/ResponsibleEditor.vue b/.vitepress/theme/components/ResponsibleEditor.vue
index 53f134b..a55c5c6 100644
--- a/.vitepress/theme/components/ResponsibleEditor.vue
+++ b/.vitepress/theme/components/ResponsibleEditor.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
 import { useData } from "vitepress"
 import { computed } from "vue"
-import { useCDN } from "@theme/utils/cdn"
+import { useCDN } from "@/theme/utils/cdn"
 
-const defaultAuthor = "GlobeMC"
 const { frontmatter } = useData()
 
 const editor = computed(() => {
-	return frontmatter.value?.editor
+	return frontmatter.value?.editor ?? "bingling-sama"
 })
 
 function getAvatarUrl(name: string) {
@@ -33,16 +32,6 @@ function getGitHubLink(name: string) {
 			</a>
 		</div>
 	</div>
-	<div v-else class="flex gap-2 items-center">
-		<a
-			:href="getGitHubLink(defaultAuthor)"
-			rel="noreferrer"
-			target="_blank"
-			class="flex items-center gap-2">
-			<img src="/logo-brand.webp" class="w-8 h-8 rounded-full" />
-			<p class="vp-main-clolr">{{ "GlobeMC" }}</p>
-		</a>
-	</div>
 </template>
 
 <style scoped>
diff --git a/.vitepress/theme/configs/vite.ts b/.vitepress/theme/configs/vite.ts
index ac16dd6..025d5d1 100644
--- a/.vitepress/theme/configs/vite.ts
+++ b/.vitepress/theme/configs/vite.ts
@@ -1,10 +1,10 @@
-import { fileURLToPath } from "node:url"
+import path from "node:path"
 import {
 	GitChangelog,
 	GitChangelogMarkdownSection,
 } from "@nolebase/vitepress-plugin-git-changelog"
 
-import authors from "@data/authors.json"
+import authors from "../../data/authors.json"
 
 function generateAvatarUrl(username: string) {
 	return `https://cdn.crashmc.com/https://github.com/${username}.png`
@@ -13,9 +13,7 @@ function generateAvatarUrl(username: string) {
 const viteConfig = {
 	resolve: {
 		alias: {
-			"@": fileURLToPath(new URL("../../", import.meta.url)),
-			"@theme": fileURLToPath(new URL("../", import.meta.url)),
-			"@data": fileURLToPath(new URL("../../data", import.meta.url)),
+			"@": path.resolve(__dirname, "../../"),
 		},
 	},
 	plugins: [
diff --git a/.vitepress/theme/layouts/Posts.vue b/.vitepress/theme/layouts/Posts.vue
index 935adfc..63a3cab 100644
--- a/.vitepress/theme/layouts/Posts.vue
+++ b/.vitepress/theme/layouts/Posts.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { data as posts } from "@data/posts.data"
+import { data as posts } from "@/data/posts.data"
 </script>
 
 <template>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3b42705..ceebd0b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -117,6 +117,9 @@ importers:
       vite-plugin-pwa:
         specifier: ^0.20.1
         version: 0.20.1(@vite-pwa/assets-generator@0.2.4)(vite@5.3.5(@types/node@20.14.12)(less@4.2.0)(sass@1.77.8)(terser@5.31.3))(workbox-build@7.1.1)(workbox-window@7.1.0)
+      vite-tsconfig-paths:
+        specifier: ^4.3.2
+        version: 4.3.2(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(less@4.2.0)(sass@1.77.8)(terser@5.31.3))
       vitepress:
         specifier: 1.3.1
         version: 1.3.1(@algolia/client-search@4.24.0)(@types/node@20.14.12)(axios@1.7.2)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.40)(sass@1.77.8)(search-insights@2.15.0)(terser@5.31.3)(typescript@5.5.4)
@@ -2217,6 +2220,9 @@ packages:
     resolution: {integrity: sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==}
     engines: {node: '>=18'}
 
+  globrex@0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+
   gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
 
@@ -3412,6 +3418,16 @@ packages:
     peerDependencies:
       typescript: '>=4.2.0'
 
+  tsconfck@3.1.1:
+    resolution: {integrity: sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.0.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   tslib@2.6.3:
     resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==}
 
@@ -3559,6 +3575,14 @@ packages:
       '@vite-pwa/assets-generator':
         optional: true
 
+  vite-tsconfig-paths@4.3.2:
+    resolution: {integrity: sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==}
+    peerDependencies:
+      vite: '*'
+    peerDependenciesMeta:
+      vite:
+        optional: true
+
   vite@5.3.5:
     resolution: {integrity: sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -6303,6 +6327,8 @@ snapshots:
       slash: 5.1.0
       unicorn-magic: 0.1.0
 
+  globrex@0.1.2: {}
+
   gopd@1.0.1:
     dependencies:
       get-intrinsic: 1.2.4
@@ -7652,6 +7678,10 @@ snapshots:
     dependencies:
       typescript: 5.5.4
 
+  tsconfck@3.1.1(typescript@5.5.4):
+    optionalDependencies:
+      typescript: 5.5.4
+
   tslib@2.6.3: {}
 
   tunnel-agent@0.6.0:
@@ -7820,6 +7850,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  vite-tsconfig-paths@4.3.2(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(less@4.2.0)(sass@1.77.8)(terser@5.31.3)):
+    dependencies:
+      debug: 4.3.5
+      globrex: 0.1.2
+      tsconfck: 3.1.1(typescript@5.5.4)
+    optionalDependencies:
+      vite: 5.3.5(@types/node@20.14.12)(less@4.2.0)(sass@1.77.8)(terser@5.31.3)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   vite@5.3.5(@types/node@20.14.12)(less@4.2.0)(sass@1.77.8)(terser@5.31.3):
     dependencies:
       esbuild: 0.21.5
diff --git a/tsconfig.json b/tsconfig.json
index 18a570e..d62ce64 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -39,12 +39,6 @@
 		"paths": {
 			"@/*": [
 				"./.vitepress/*"
-			],
-			"@theme/*": [
-				"./.vitepress/theme/*"
-			],
-			"@data/*": [
-				"./.vitepress/data/*"
 			]
 		},
 		"types": [