From b7232bc9eeb8984b375bcc2f1dfb58d451b5c22b Mon Sep 17 00:00:00 2001 From: Paul Reimer Date: Tue, 19 Jan 2016 16:18:51 -0800 Subject: [PATCH 1/6] Allow overriding --host, --port, and --progress args with environment variables: WEBPACK_DEV_SERVER_HOST, WEBPACK_DEV_SERVER_PORT, WEBPACK_DEV_SERVER_PROGRESS --- bin/webpack-dev-server.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js index 979dc6ea62..b74dced1d2 100755 --- a/bin/webpack-dev-server.js +++ b/bin/webpack-dev-server.js @@ -52,6 +52,18 @@ require("webpack/bin/config-optimist")(optimist); var argv = optimist.argv; +if (process.env.WEBPACK_DEV_SERVER_HOST) + argv.host = process.env.WEBPACK_DEV_SERVER_HOST; + +if (process.env.WEBPACK_DEV_SERVER_PORT) + argv.port = process.env.WEBPACK_DEV_SERVER_PORT; + +if (process.env.WEBPACK_DEV_SERVER_PROGRESS) +{ + argv.progress = ["true", "1", "t", "y", "yes"] + .indexOf(process.env.WEBPACK_DEV_SERVER_PROGRESS.toLowerCase()) != -1; +} + var wpOpt = require("webpack/bin/convert-argv")(optimist, argv, { outputFilename: "/bundle.js" }); var firstWpOpt = Array.isArray(wpOpt) ? wpOpt[0] : wpOpt; From 3c0eeb10a11e49c2674f5fc0cca0ad576d4da252 Mon Sep 17 00:00:00 2001 From: Paul Reimer Date: Tue, 19 Jan 2016 16:53:05 -0800 Subject: [PATCH 2/6] Parse a URI and extract the hostname/IP portion for overriding --host with process.env.WEBPACK_DEV_SERVER_HOST --- bin/webpack-dev-server.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js index b74dced1d2..110d32fa2b 100755 --- a/bin/webpack-dev-server.js +++ b/bin/webpack-dev-server.js @@ -53,10 +53,17 @@ require("webpack/bin/config-optimist")(optimist); var argv = optimist.argv; if (process.env.WEBPACK_DEV_SERVER_HOST) - argv.host = process.env.WEBPACK_DEV_SERVER_HOST; +{ + // match a URI e.g. 'tcp://1.2.3.4:5678/path' or '1.2.3.4' + // extract the host portion (1.2.3.4) + argv.host = process.env.WEBPACK_DEV_SERVER_HOST + .replace(/(?:[^\/]*\/\/)?([^:\/]+)[:\/]?.*/, '$1'); +} if (process.env.WEBPACK_DEV_SERVER_PORT) +{ argv.port = process.env.WEBPACK_DEV_SERVER_PORT; +} if (process.env.WEBPACK_DEV_SERVER_PROGRESS) { From fbea98bdbadaf4a27bbb728f4048b4ecd8615d32 Mon Sep 17 00:00:00 2001 From: Paul Reimer Date: Wed, 20 Jan 2016 14:10:14 -0800 Subject: [PATCH 3/6] Renamed prepublish script to install --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b43498f8f8..1d74605dc3 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,6 @@ "ssl/" ], "scripts": { - "prepublish": "webpack ./client/live.js client/live.bundle.js --colors --config client/webpack.config.js -p && webpack ./client/index.js client/index.bundle.js --colors --config client/webpack.config.js -p" + "install": "webpack ./client/live.js client/live.bundle.js --colors --config client/webpack.config.js -p && webpack ./client/index.js client/index.bundle.js --colors --config client/webpack.config.js -p" } } From 71f78c3c7a3d905df8a2ffa7a573b5e3a0d6c706 Mon Sep 17 00:00:00 2001 From: Paul Reimer Date: Wed, 20 Jan 2016 14:13:33 -0800 Subject: [PATCH 4/6] Made jade a runtime dependency in package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 1d74605dc3..442841aec1 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "connect-history-api-fallback": "1.1.0", "express": "^4.13.3", "http-proxy": "^1.11.2", + "jade": "^1.11.0", "optimist": "~0.6.0", "serve-index": "^1.7.2", "sockjs": "^0.3.15", From ea6f81845a776404f250a944990cb02775dae0fe Mon Sep 17 00:00:00 2001 From: Paul Reimer Date: Thu, 21 Jan 2016 11:39:42 -0800 Subject: [PATCH 5/6] Replaced regex to parse host from WEBPACK_DEV_SERVER_HOST with logic to use "0.0.0.0" if a DOCKER_HOST formatted-string is found --- bin/webpack-dev-server.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js index 110d32fa2b..1589b5f86a 100755 --- a/bin/webpack-dev-server.js +++ b/bin/webpack-dev-server.js @@ -54,10 +54,10 @@ var argv = optimist.argv; if (process.env.WEBPACK_DEV_SERVER_HOST) { - // match a URI e.g. 'tcp://1.2.3.4:5678/path' or '1.2.3.4' - // extract the host portion (1.2.3.4) - argv.host = process.env.WEBPACK_DEV_SERVER_HOST - .replace(/(?:[^\/]*\/\/)?([^:\/]+)[:\/]?.*/, '$1'); + if (process.env.WEBPACK_DEV_SERVER_HOST.startsWith("tcp://")) + argv.host = "0.0.0.0"; + else + argv.host = process.env.WEBPACK_DEV_SERVER_HOST; } if (process.env.WEBPACK_DEV_SERVER_PORT) From 1f176043f48b89eb979104644db5685e4c8f9cab Mon Sep 17 00:00:00 2001 From: Paul Reimer Date: Thu, 21 Jan 2016 11:44:41 -0800 Subject: [PATCH 6/6] Use indexOf instead of startsWith (since startsWith is not available in this version) --- bin/webpack-dev-server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js index 1589b5f86a..055b9fb42f 100755 --- a/bin/webpack-dev-server.js +++ b/bin/webpack-dev-server.js @@ -54,7 +54,8 @@ var argv = optimist.argv; if (process.env.WEBPACK_DEV_SERVER_HOST) { - if (process.env.WEBPACK_DEV_SERVER_HOST.startsWith("tcp://")) + // startsWith("tcp://") + if (process.env.WEBPACK_DEV_SERVER_HOST.indexOf("tcp://", 0) == 0) argv.host = "0.0.0.0"; else argv.host = process.env.WEBPACK_DEV_SERVER_HOST;