Skip to content

Backport support for configuration as Promise in Webpack v1 #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2017
Merged

Backport support for configuration as Promise in Webpack v1 #698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
238 changes: 126 additions & 112 deletions bin/webpack-dev-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,147 +68,161 @@ var argv = optimist.argv;
var wpOpt = require("webpack/bin/convert-argv")(optimist, argv, {
outputFilename: "/bundle.js"
});
var firstWpOpt = Array.isArray(wpOpt) ? wpOpt[0] : wpOpt;

var options = wpOpt.devServer || firstWpOpt.devServer || {};
function processOptions(wpOpt) {
//process Promise
if(typeof wpOpt.then === "function") {
wpOpt.then(processOptions).catch(function(err) {
console.error(err.stack || err);
process.exit(); // eslint-disable-line
});
return;
}

if(argv.host !== "localhost" || !options.host)
options.host = argv.host;
var firstWpOpt = Array.isArray(wpOpt) ? wpOpt[0] : wpOpt;

if(argv.public)
options.public = argv.public;
var options = wpOpt.devServer || firstWpOpt.devServer || {};

if(argv.port !== 8080 || !options.port)
options.port = argv.port;
if(argv.host !== "localhost" || !options.host)
options.host = argv.host;

if(!options.publicPath) {
options.publicPath = firstWpOpt.output && firstWpOpt.output.publicPath || "";
if(!/^(https?:)?\/\//.test(options.publicPath) && options.publicPath[0] !== "/")
options.publicPath = "/" + options.publicPath;
}
if(argv.public)
options.public = argv.public;

if(!options.outputPath)
options.outputPath = "/";
if(!options.filename)
options.filename = firstWpOpt.output && firstWpOpt.output.filename;
[].concat(wpOpt).forEach(function(wpOpt) {
wpOpt.output.path = "/";
});
if(argv.port !== 8080 || !options.port)
options.port = argv.port;

if(!options.watchOptions)
options.watchOptions = firstWpOpt.watchOptions;
if(!options.publicPath) {
options.publicPath = firstWpOpt.output && firstWpOpt.output.publicPath || "";
if(!/^(https?:)?\/\//.test(options.publicPath) && options.publicPath[0] !== "/")
options.publicPath = "/" + options.publicPath;
}

if(argv["stdin"]) {
process.stdin.on('end', function() {
process.exit(0); // eslint-disable-line no-process-exit
if(!options.outputPath)
options.outputPath = "/";
if(!options.filename)
options.filename = firstWpOpt.output && firstWpOpt.output.filename;
[].concat(wpOpt).forEach(function(wpOpt) {
wpOpt.output.path = "/";
});
process.stdin.resume();
}

if(!options.watchDelay && !options.watchOptions) // TODO remove in next major version
options.watchDelay = firstWpOpt.watchDelay;

if(!options.hot)
options.hot = argv["hot"];

if(argv["content-base"]) {
options.contentBase = argv["content-base"];
if(/^[0-9]$/.test(options.contentBase))
options.contentBase = +options.contentBase;
else if(!/^(https?:)?\/\//.test(options.contentBase))
options.contentBase = path.resolve(options.contentBase);
} else if(argv["content-base-target"]) {
options.contentBase = {
target: argv["content-base-target"]
};
} else if(!options.contentBase) {
options.contentBase = process.cwd();
}
if(!options.watchOptions)
options.watchOptions = firstWpOpt.watchOptions;

if(!options.stats) {
options.stats = {
cached: false,
cachedAssets: false
};
}
if(argv["stdin"]) {
process.stdin.on('end', function() {
process.exit(0); // eslint-disable-line no-process-exit
});
process.stdin.resume();
}

if(typeof options.stats === "object" && typeof options.stats.colors === "undefined")
options.stats.colors = require("supports-color");
if(!options.watchDelay && !options.watchOptions) // TODO remove in next major version
options.watchDelay = firstWpOpt.watchDelay;

if(!options.hot)
options.hot = argv["hot"];

if(argv["content-base"]) {
options.contentBase = argv["content-base"];
if(/^[0-9]$/.test(options.contentBase))
options.contentBase = +options.contentBase;
else if(!/^(https?:)?\/\//.test(options.contentBase))
options.contentBase = path.resolve(options.contentBase);
} else if(argv["content-base-target"]) {
options.contentBase = {
target: argv["content-base-target"]
};
} else if(!options.contentBase) {
options.contentBase = process.cwd();
}

if(!options.stats) {
options.stats = {
cached: false,
cachedAssets: false
};
}

if(argv["lazy"])
options.lazy = true;
if(typeof options.stats === "object" && typeof options.stats.colors === "undefined")
options.stats.colors = require("supports-color");

if(!argv["info"])
options.noInfo = true;
if(argv["lazy"])
options.lazy = true;

if(argv["quiet"])
options.quiet = true;
if(!argv["info"])
options.noInfo = true;

if(argv["https"])
options.https = true;
if(argv["quiet"])
options.quiet = true;

if(argv["cert"])
options.cert = fs.readFileSync(path.resolve(argv["cert"]));
if(argv["https"])
options.https = true;

if(argv["key"])
options.key = fs.readFileSync(path.resolve(argv["key"]));
if(argv["cert"])
options.cert = fs.readFileSync(path.resolve(argv["cert"]));

if(argv["cacert"])
options.ca = fs.readFileSync(path.resolve(argv["cacert"]));
if(argv["key"])
options.key = fs.readFileSync(path.resolve(argv["key"]));

if(argv["pfx"])
options.pfx = fs.readFileSync(path.resolve(argv["pfx"]));
if(argv["cacert"])
options.ca = fs.readFileSync(path.resolve(argv["cacert"]));

if(argv["pfx-passphrase"])
options.pfxPassphrase = argv["pfx-passphrase"];
if(argv["pfx"])
options.pfx = fs.readFileSync(path.resolve(argv["pfx"]));

if(argv["inline"])
options.inline = true;
if(argv["pfx-passphrase"])
options.pfxPassphrase = argv["pfx-passphrase"];

if(argv["history-api-fallback"])
options.historyApiFallback = true;
if(argv["inline"])
options.inline = true;

if(argv["client-log-level"])
options.clientLogLevel = argv["client-log-level"];
if(argv["history-api-fallback"])
options.historyApiFallback = true;

if(argv["compress"])
options.compress = true;
if(argv["client-log-level"])
options.clientLogLevel = argv["client-log-level"];

if(argv["open"])
options.open = true;
if(argv["compress"])
options.compress = true;

var protocol = options.https ? "https" : "http";
if(argv["open"])
options.open = true;

if(options.inline) {
var devClient = [require.resolve("../client/") + "?" + protocol + "://" + (options.public || (options.host + ":" + options.port))];
var protocol = options.https ? "https" : "http";

if(options.hot)
devClient.push("webpack/hot/dev-server");
[].concat(wpOpt).forEach(function(wpOpt) {
if(typeof wpOpt.entry === "object" && !Array.isArray(wpOpt.entry)) {
Object.keys(wpOpt.entry).forEach(function(key) {
wpOpt.entry[key] = devClient.concat(wpOpt.entry[key]);
});
} else {
wpOpt.entry = devClient.concat(wpOpt.entry);
}
if(options.inline) {
var devClient = [require.resolve("../client/") + "?" + protocol + "://" + (options.public || (options.host + ":" + options.port))];

if(options.hot)
devClient.push("webpack/hot/dev-server");
[].concat(wpOpt).forEach(function(wpOpt) {
if(typeof wpOpt.entry === "object" && !Array.isArray(wpOpt.entry)) {
Object.keys(wpOpt.entry).forEach(function(key) {
wpOpt.entry[key] = devClient.concat(wpOpt.entry[key]);
});
} else {
wpOpt.entry = devClient.concat(wpOpt.entry);
}
});
}

new Server(webpack(wpOpt), options).listen(options.port, options.host, function(err) {
var uri = protocol + "://" + options.host + ":" + options.port + "/";
if(!options.inline)
uri += "webpack-dev-server/";

if(err) throw err;
console.log(" " + uri);
console.log("webpack result is served from " + options.publicPath);
if(typeof options.contentBase === "object")
console.log("requests are proxied to " + options.contentBase.target);
else
console.log("content is served from " + options.contentBase);
if(options.historyApiFallback)
console.log("404s will fallback to %s", options.historyApiFallback.index || "/index.html");
if(options.open)
open(uri);
});
}

new Server(webpack(wpOpt), options).listen(options.port, options.host, function(err) {
var uri = protocol + "://" + options.host + ":" + options.port + "/";
if(!options.inline)
uri += "webpack-dev-server/";

if(err) throw err;
console.log(" " + uri);
console.log("webpack result is served from " + options.publicPath);
if(typeof options.contentBase === "object")
console.log("requests are proxied to " + options.contentBase.target);
else
console.log("content is served from " + options.contentBase);
if(options.historyApiFallback)
console.log("404s will fallback to %s", options.historyApiFallback.index || "/index.html");
if(options.open)
open(uri);
});
processOptions(wpOpt);