summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-02-20 18:57:31 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-02-20 18:57:31 +0000
commit90fc4d1078af4fec2f63ade13780084a0471d116 (patch)
tree52bb241e3bf5892d08a4aa92267c9a3eee444546
parent3e6a5cf0edbc4029104a7b0f6e96f2a3f5d3eae0 (diff)
parent21dd33be46f02635ba8be711721056e3762db870 (diff)
downloadgitlab-ce-90fc4d1078af4fec2f63ade13780084a0471d116.tar.gz
Merge branch '28204-option-to-disable-webpack-dev-server-livereload' into 'master'
Pick up option from GDK to disable webpack dev server livereload Closes #28204 See merge request !9287
-rw-r--r--changelogs/unreleased/28204-option-to-disable-webpack-dev-server-livereload.yml4
-rw-r--r--config/webpack.config.js2
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/28204-option-to-disable-webpack-dev-server-livereload.yml b/changelogs/unreleased/28204-option-to-disable-webpack-dev-server-livereload.yml
new file mode 100644
index 00000000000..df2478a3f28
--- /dev/null
+++ b/changelogs/unreleased/28204-option-to-disable-webpack-dev-server-livereload.yml
@@ -0,0 +1,4 @@
+---
+title: Pick up option from GDK to disable webpack dev server livereload
+merge_request:
+author:
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 515569b2e97..15899993874 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -10,6 +10,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
var IS_PRODUCTION = process.env.NODE_ENV === 'production';
var IS_DEV_SERVER = process.argv[1].indexOf('webpack-dev-server') !== -1;
var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
+var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false';
var config = {
context: path.join(ROOT_PATH, 'app/assets/javascripts'),
@@ -114,6 +115,7 @@ if (IS_DEV_SERVER) {
port: DEV_SERVER_PORT,
headers: { 'Access-Control-Allow-Origin': '*' },
stats: 'errors-only',
+ inline: DEV_SERVER_LIVERELOAD
};
config.output.publicPath = '//localhost:' + DEV_SERVER_PORT + config.output.publicPath;
}