revert: 952de91

vuejs · Jul 14, 2022 · 5c2854f · 5c2854f
1 parent 0e522e7
commit 5c2854f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/client/app/index.ts b/src/client/app/index.ts
@@ -7,7 +7,7 @@ import {
   onMounted,
   watch
 } from 'vue'
-import Theme from '../theme-default'
+import Theme from '/@theme/index'
 import { inBrowser, pathToFile } from './utils'
 import { Router, RouterSymbol, createRouter } from './router'
 import { siteDataRef, useData } from './data'

diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
@@ -11,6 +11,7 @@
     "lib": ["ESNext", "DOM"],
     "types": ["vite/client"],
     "paths": {
+      "/@theme/*": ["theme-default/*"],
       "vitepress": ["index.ts"],
       "vitepress/theme": ["../../types/default-theme.d"]
     }

diff --git a/src/node/alias.ts b/src/node/alias.ts
@@ -16,11 +16,17 @@ export const SITE_DATA_ID = '@siteData'
 export const SITE_DATA_REQUEST_PATH = '/' + SITE_DATA_ID
 
 export function resolveAliases(root: string, themeDir: string): AliasOptions {
+  const paths: Record<string, string> = {
+    '/@theme': themeDir,
+    '@theme': themeDir,
+    [SITE_DATA_ID]: SITE_DATA_REQUEST_PATH
+  }
+
   const aliases: Alias[] = [
-    {
-      find: SITE_DATA_ID,
-      replacement: SITE_DATA_REQUEST_PATH
-    },
+    ...Object.keys(paths).map((p) => ({
+      find: p,
+      replacement: paths[p]
+    })),
     {
       find: /^vitepress$/,
       replacement: join(DIST_CLIENT_PATH, '/index')