aboutsummaryrefslogtreecommitdiff
path: root/node_modules/webpack/bin/convert-argv.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-10-14 18:40:54 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-10-14 18:40:54 +0200
commit9df98e65f842cf3acae09cbdd969966f42d64469 (patch)
treef071d3e09a342c208fb8e1cd3f5241d64fbfbaf3 /node_modules/webpack/bin/convert-argv.js
parent008926b18470e7f394cd640302957b29728a9803 (diff)
update dependencies
Diffstat (limited to 'node_modules/webpack/bin/convert-argv.js')
-rw-r--r--node_modules/webpack/bin/convert-argv.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/node_modules/webpack/bin/convert-argv.js b/node_modules/webpack/bin/convert-argv.js
index 043ea2abb..db68f76a6 100644
--- a/node_modules/webpack/bin/convert-argv.js
+++ b/node_modules/webpack/bin/convert-argv.js
@@ -166,12 +166,12 @@ module.exports = function(yargs, argv, convertOptions) {
options.watchOptions.aggregateTimeout = +argv["watch-aggregate-timeout"];
}
- if(argv["watch-poll"]) {
+ if(typeof argv["watch-poll"] !== "undefined") {
options.watchOptions = options.watchOptions || {};
- if(typeof argv["watch-poll"] !== "boolean")
- options.watchOptions.poll = +argv["watch-poll"];
- else
+ if(argv["watch-poll"] === "true" || argv["watch-poll"] === "")
options.watchOptions.poll = true;
+ else if(!isNaN(argv["watch-poll"]))
+ options.watchOptions.poll = +argv["watch-poll"];
}
if(argv["watch-stdin"]) {
@@ -537,7 +537,7 @@ module.exports = function(yargs, argv, convertOptions) {
if(i < 0 || (j >= 0 && j < i)) {
var resolved = path.resolve(content);
if(fs.existsSync(resolved)) {
- addTo("main", resolved);
+ addTo("main", `${resolved}${fs.statSync(resolved).isDirectory() ? path.sep : ""}`);
} else {
addTo("main", content);
}