handle base option

vuejs · May 16, 2020 · 2f8ef43 · 2f8ef43
1 parent 42bac42
commit 2f8ef43
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/app/index.js b/lib/app/index.js
@@ -60,7 +60,7 @@ export function createApp() {
       const useLeanBuild = isInitialPageLoad || initialPath === pagePath
       pagePath =
         (inBrowser ? __BASE__ + '_assets/' : './') +
-        pagePath.slice(1).replace(/\//g, '_') +
+        pagePath.slice(inBrowser ? __BASE__.length : 1).replace(/\//g, '_') +
         (useLeanBuild ? '.md.lean.js' : '.md.js')
     }
 

diff --git a/src/build/bundle.ts b/src/build/bundle.ts
@@ -85,6 +85,7 @@ export async function bundle(
   const { rollupInputOptions = {}, rollupOutputOptions = {} } = options
   const viteOptions: ViteBuildOptions = {
     ...options,
+    base: config.site.base,
     resolvers: [resolver],
     outDir: config.outDir,
     assetsDir: ASSETS_DIR,

diff --git a/src/config.ts b/src/config.ts
@@ -91,7 +91,7 @@ export async function resolveSiteData(root: string): Promise<SiteData> {
   return {
     title: userConfig.title || 'VitePress',
     description: userConfig.description || 'A VitePress site',
-    base: userConfig.base || '/',
+    base: userConfig.base ? userConfig.base.replace(/([^/])$/, '$1/') : '/',
     head: userConfig.head || [],
     themeConfig: userConfig.themeConfig || {}
   }