summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-08-08 08:42:24 -0500
committerMike Greiling <mike@pixelcog.com>2017-08-15 00:06:11 -0500
commit60ed4aa568889e869b0e447dffdd1af7bbb51cae (patch)
tree70c877b12fd791591d232248f434f7b7531a917b
parenteb03da693c57327df1426eb3057af252bfd299f6 (diff)
downloadgitlab-ce-60ed4aa568889e869b0e447dffdd1af7bbb51cae.tar.gz
enable webpack scope hoisting
-rw-r--r--config/webpack.config.js3
-rw-r--r--package.json2
-rw-r--r--yarn.lock6
3 files changed, 7 insertions, 4 deletions
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..7cae0ecdd83 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.1",
"webpack-bundle-analyzer": "^2.8.2",
"webpack-stats-plugin": "^0.1.5"
},
diff --git a/yarn.lock b/yarn.lock
index c9e1b630a9e..0ac1a890ea9 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.1:
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.1.tgz#b749ee3d2b5a118dad53e8e41585b3f71e75499a"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^2.0.0"