From 75cdc744c17037fd7797122c39a052266a37d0d2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 25 May 2018 12:32:54 -0400
Subject: [PATCH] fix: avoid cache error (close #492)

---
 lib/webpack/createBaseConfig.js | 3 ++-
 package.json                    | 2 +-
 yarn.lock                       | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/webpack/createBaseConfig.js b/lib/webpack/createBaseConfig.js
index 9586be92d1..b4740fc34a 100644
--- a/lib/webpack/createBaseConfig.js
+++ b/lib/webpack/createBaseConfig.js
@@ -85,7 +85,8 @@ module.exports = function createBaseConfig ({
     vuepress: require('../../package.json').version,
     'cache-loader': require('cache-loader').version,
     'vue-loader': require('vue-loader').version,
-    env: process.env.NODE_ENV,
+    isProd,
+    isServer,
     config: (
       (siteConfig.chainWebpack || '').toString() +
       (siteConfig.configureWebpack || '').toString()
diff --git a/package.json b/package.json
index 8c032d1df7..2a95c174dc 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "toml": "^2.3.3",
     "url-loader": "^1.0.1",
     "vue": "^2.5.16",
-    "vue-loader": "^15.2.0",
+    "vue-loader": "^15.2.1",
     "vue-router": "^3.0.1",
     "vue-server-renderer": "^2.5.16",
     "vue-template-compiler": "^2.5.16",
diff --git a/yarn.lock b/yarn.lock
index 4c323e4a1e..221b0c2e63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7288,9 +7288,9 @@ vue-hot-reload-api@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
 
-vue-loader@^15.2.0:
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.0.tgz#5a8138e490a1040942d2f10ae68fa72b5a923364"
+vue-loader@^15.2.1:
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.1.tgz#89a13b6b7dec63614729c73b1b46a571a69bb20e"
   dependencies:
     "@vue/component-compiler-utils" "^1.2.1"
     hash-sum "^1.0.2"