diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js index 979dc6ea62..055b9fb42f 100755 --- a/bin/webpack-dev-server.js +++ b/bin/webpack-dev-server.js @@ -52,6 +52,26 @@ require("webpack/bin/config-optimist")(optimist); var argv = optimist.argv; +if (process.env.WEBPACK_DEV_SERVER_HOST) +{ + // 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; +} + +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; diff --git a/package.json b/package.json index b43498f8f8..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", @@ -46,6 +47,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" } }