summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2019-07-26 14:38:12 -0700
committerDJ Mountney <david@twkie.net>2019-07-26 14:38:12 -0700
commit2317f45f5e417ae02be25ca292810931dc9a6c9a (patch)
tree626aaeede44ff04708f5f84927b91e7d93cb635c
parent8a78ad8cb16a74bb18dc4b38963572c8ef488f08 (diff)
downloadgitlab-ce-allow-webpack-devtools-config.tar.gz
Fix the assignment logicallow-webpack-devtools-config
-rw-r--r--.gitlab/ci/frontend.gitlab-ci.yml1
-rw-r--r--config/webpack.config.js3
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index fe369ffec13..77cc86fb80a 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -23,6 +23,7 @@
variables:
NODE_ENV: "production"
RAILS_ENV: "production"
+ WEBPACK_DEVTOOL: "nosources-source-map"
SETUP_DB: "false"
SKIP_STORAGE_VALIDATION: "true"
WEBPACK_REPORT: "true"
diff --git a/config/webpack.config.js b/config/webpack.config.js
index d82c2b70c3e..08b70bae471 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -22,7 +22,8 @@ const NO_SOURCEMAPS = process.env.NO_SOURCEMAPS;
const VUE_VERSION = require('vue/package.json').version;
const VUE_LOADER_VERSION = require('vue-loader/package.json').version;
-const devtool = process.env.WEBPACK_DEVTOOL || IS_PRODUCTION ? 'source-map' : 'cheap-module-eval-source-map';
+const devtool =
+ process.env.WEBPACK_DEVTOOL || (IS_PRODUCTION ? 'source-map' : 'cheap-module-eval-source-map');
let autoEntriesCount = 0;
let watchAutoEntries = [];