From b5c6e9eda2d9a341b50590ab740b2467fc60caa8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 5 Apr 2018 17:32:23 -0400
Subject: [PATCH] properly handle base

---
 .gitignore                | 2 +-
 docs/.vuepress/config.js  | 6 +++---
 docs/README.md            | 2 --
 docs/config.md            | 4 +++-
 docs/kitchen/sink.md      | 4 ++++
 lib/app/app.js            | 3 ++-
 lib/prepare.js            | 4 +++-
 lib/webpack/baseConfig.js | 2 +-
 8 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95818d4e..96930bdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 node_modules
 *.log
 .temp
-docs/.vuepress/dist
+vuepress
 TODOs.md
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 309faee8..e56bf860 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  data: {
-    title: 'VuePress'
-  }
+  base: '/vuepress/',
+  title: 'VuePress',
+  dest: 'vuepress'
 }
diff --git a/docs/README.md b/docs/README.md
index d2ad51d6..1cabff36 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,5 +1,3 @@
 # VuePress
 
-![logo](/logo.png)
-
 > Minimalistic docs generator with Vue component based layout system
diff --git a/docs/config.md b/docs/config.md
index eca2eb47..c0af069f 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -2,7 +2,9 @@
 
 ## `.vuepress/config.js`
 
-### baseUrl
+### base
+
+### title
 
 ### head
 
diff --git a/docs/kitchen/sink.md b/docs/kitchen/sink.md
index 7a15e074..ba8ed58a 100644
--- a/docs/kitchen/sink.md
+++ b/docs/kitchen/sink.md
@@ -45,3 +45,7 @@ var vm = new Vue({
 
 - Foo is {{ $page.frontmatter.foo }}
 - Bar is {{ $page.frontmatter.bar }}
+
+## Using Site Data
+
+<img :src="`${$site.base}logo.png`" alt="logo">
diff --git a/lib/app/app.js b/lib/app/app.js
index 1dad4736..566b3e4d 100644
--- a/lib/app/app.js
+++ b/lib/app/app.js
@@ -9,7 +9,7 @@ import metadataMixin from './metadataMixin'
 //    async components;
 // 2. exports siteData
 // 3. exports routes
-import { routes } from './.temp/siteData'
+import { routes, siteData } from './.temp/siteData'
 
 Vue.use(Router)
 
@@ -27,6 +27,7 @@ routes.push({
 
 export function createApp () {
   const router = new Router({
+    base: siteData.base,
     mode: 'history',
     fallback: false,
     routes
diff --git a/lib/prepare.js b/lib/prepare.js
index 2481596b..7b6824d2 100644
--- a/lib/prepare.js
+++ b/lib/prepare.js
@@ -49,7 +49,7 @@ async function resolveOptions (sourceDir) {
     outDir: siteConfig.dest
       ? path.resolve(siteConfig.dest)
       : path.resolve(sourceDir, '.vuepress/dist'),
-    publicPath: siteConfig.baseUrl || '/',
+    publicPath: siteConfig.base || '/',
     pageFiles: await globby(['**/*.md', '!.vuepress'], { cwd: sourceDir })
   }
 
@@ -110,6 +110,8 @@ async function resolveOptions (sourceDir) {
 
   // resolve site data
   options.siteData = Object.assign({}, siteConfig.data, {
+    title: siteConfig.title,
+    base: siteConfig.base || '/',
     pages: pagesData
   })
 
diff --git a/lib/webpack/baseConfig.js b/lib/webpack/baseConfig.js
index abe189ba..bc331fe6 100644
--- a/lib/webpack/baseConfig.js
+++ b/lib/webpack/baseConfig.js
@@ -23,7 +23,7 @@ module.exports = function createBaseConfig ({
     .output
       .path(outDir)
       .filename(isProd ? '_assets/js/[name].[chunkhash:8].js' : '_assets/js/[name].js')
-      .publicPath(publicPath)
+      .publicPath(isProd ? publicPath : '/')
 
   config.resolve
     .set('symlinks', true)