summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMike Greiling <mgreiling@gitlab.com>2017-04-12 19:05:23 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-04-12 19:05:23 +0000
commit10deca824ed55d642ba942d21df768d9c1a376bc (patch)
tree88d7b7b2211140e15796d23d7da7c80278517af5 /config
parentc68ea29d5dcaa9a5ab00aaf49cbcc65d7ce98c6d (diff)
downloadgitlab-ce-10deca824ed55d642ba942d21df768d9c1a376bc.tar.gz
Improve webpack-dev-server compatibility with non-localhost setups.
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 0fea3f8222b..ffb16190093 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -11,6 +11,7 @@ var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeMod
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_HOST = process.env.DEV_SERVER_HOST || 'localhost';
var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false';
var WEBPACK_REPORT = process.env.WEBPACK_REPORT;
@@ -182,12 +183,13 @@ if (IS_PRODUCTION) {
if (IS_DEV_SERVER) {
config.devtool = 'cheap-module-eval-source-map';
config.devServer = {
+ host: DEV_SERVER_HOST,
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;
+ config.output.publicPath = '//' + DEV_SERVER_HOST + ':' + DEV_SERVER_PORT + config.output.publicPath;
config.plugins.push(
// watch node_modules for changes if we encounter a missing module compile error
new WatchMissingNodeModulesPlugin(path.join(ROOT_PATH, 'node_modules'))