diff --git a/config/webpack.config.js b/config/webpack.config.js
index 8e1b80cd39f..6a347c2e660 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -223,6 +223,9 @@ var config = {
       names: ['main', 'locale', 'common', 'webpack_runtime'],
     }),
 
+    // enable scope hoisting
+    new webpack.optimize.ModuleConcatenationPlugin(),
+
     // copy pre-compiled vendor libraries verbatim
     new CopyWebpackPlugin([
       {
diff --git a/package.json b/package.json
index c5247a63e67..cbb9be3a27f 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "vue-loader": "^11.3.4",
     "vue-resource": "^1.3.4",
     "vue-template-compiler": "^2.2.6",
-    "webpack": "^3.4.0",
+    "webpack": "^3.5.4",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-stats-plugin": "^0.1.5"
   },
diff --git a/yarn.lock b/yarn.lock
index c9e1b630a9e..5fc28f8b5ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6275,9 +6275,9 @@ webpack-stats-plugin@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.1.5.tgz#29e5f12ebfd53158d31d656a113ac1f7b86179d9"
 
-webpack@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.4.0.tgz#e9465b660ad79dd2d33874d968b31746ea9a8e63"
+webpack@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"