summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2018-03-22 19:41:48 +0000
committerJacob Schatz <jschatz@gitlab.com>2018-03-22 19:41:48 +0000
commit9087ea369e967fd36c34f39f7988a61ec31fc95a (patch)
treeeabd7a0c08bd4b9231a3d60a1a09c7b540ce56bc
parentc920d165f544d6c45a7cc357fcf330f48c10244c (diff)
parent907045b268c977bc97f2f6d54980ae4c65efa19c (diff)
downloadgitlab-ce-9087ea369e967fd36c34f39f7988a61ec31fc95a.tar.gz
Merge branch 'move-concatenate-module-plugin' into 'master'
Disable webpack scope hoisting in development See merge request gitlab-org/gitlab-ce!17942
-rw-r--r--config/webpack.config.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index f5fb7de6176..213b05e653c 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -222,9 +222,6 @@ const config = {
names: ['main', 'common', 'webpack_runtime'],
}),
- // enable scope hoisting
- new webpack.optimize.ModuleConcatenationPlugin(),
-
// copy pre-compiled vendor libraries verbatim
new CopyWebpackPlugin([
{
@@ -281,6 +278,7 @@ if (IS_PRODUCTION) {
minimize: true,
debug: false,
}),
+ new webpack.optimize.ModuleConcatenationPlugin(),
new webpack.optimize.UglifyJsPlugin({
sourceMap: true,
}),