Skip to content

Commit 89058a2

Browse files
sokrasokra
committed
Reverted watch option rename:
watch -> doWatch -> watch watchDelay -> watch -> watchOptions watchDelay and --watch-delay are decrecated now but functional with message watch is decrecated now but functional with message
1 parent 7a05452 commit 89058a2

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎bin/convert-argv.js‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,30 +75,37 @@ module.exports = function(optimist, argv, convertOptions) {
7575
}
7676

7777
if(argv["watch"]) {
78+
// TODO remove this in next major version
79+
if(options.watch && typeof options.watch === "object") {
80+
console.warn("options.watch is deprecated: use options.watchOptions instead");
81+
options.watchOptions = options.watch;
82+
}
83+
// TODO remove this in next major version
7884
if(options.watchDelay) {
79-
console.warn("watchDelay is deprecated: Use 'watch.aggregateTimeout' instead.");
80-
options.watch = options.watch || {};
81-
options.watch.aggregateTimeout = options.watchDelay;
85+
console.warn("options.watchDelay is deprecated: Use 'options.watchOptions.aggregateTimeout' instead");
86+
options.watchOptions = options.watchOptions || {};
87+
options.watchOptions.aggregateTimeout = options.watchDelay;
8288
}
83-
options.doWatch = true;
89+
options.watch = true;
8490
}
8591

8692
if(argv["watch-delay"]) {
87-
options.watch = options.watch || {};
88-
options.watch.aggregateTimeout = +argv["watch-delay"];
93+
console.warn("--watch-delay is deprecated: Use '--watch-aggregate-timeout' instead");
94+
options.watchOptions = options.watchOptions || {};
95+
options.watchOptions.aggregateTimeout = +argv["watch-delay"];
8996
}
9097

9198
if(argv["watch-aggregate-timeout"]) {
92-
options.watch = options.watch || {};
93-
options.watch.aggregateTimeout = +argv["watch-aggregate-timeout"];
99+
options.watchOptions = options.watchOptions || {};
100+
options.watchOptions.aggregateTimeout = +argv["watch-aggregate-timeout"];
94101
}
95102

96103
if(argv["watch-poll"]) {
97-
options.watch = options.watch || {};
104+
options.watchOptions = options.watchOptions || {};
98105
if(typeof argv["watch-poll"] !== "boolean")
99-
options.watch.poll = +argv["watch-poll"];
106+
options.watchOptions.poll = +argv["watch-poll"];
100107
else
101-
options.watch.poll = true;
108+
options.watchOptions.poll = true;
102109
}
103110

104111
function processOptions(options) {

‎bin/webpack.js‎

100755100644
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ Error.stackTrackLimit = 30;
145145
var lastHash = null;
146146
var compiler = webpack(options);
147147
function compilerCallback(err, stats) {
148-
if(!options.doWatch) {
148+
if(!options.watch) {
149149
// Do not keep cache anymore
150150
compiler.purgeInputFileSystem();
151151
}
152152
if(err) {
153153
lastHash = null;
154154
console.error(err.stack || err);
155155
if(err.details) console.error(err.details);
156-
if(!options.doWatch) {
156+
if(!options.watch) {
157157
process.on("exit", function() {
158158
process.exit(1);
159159
});
@@ -167,7 +167,9 @@ function compilerCallback(err, stats) {
167167
process.stdout.write(stats.toString(outputOptions) + "\n");
168168
}
169169
}
170-
if(options.doWatch)
170+
if(options.watch) {
171+
var primaryOptions = !Array.isArray(options) ? options : options[0];
172+
var watchOptions = primaryOptions.watchOptions || primaryOptions.watch || {};
171173
compiler.watch(options.watch, compilerCallback);
172-
else
174+
} else
173175
compiler.run(compilerCallback);

‎lib/webpack.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ function webpack(options, callback) {
2929
if(callback) {
3030
if(typeof callback !== "function") throw new Error("Invalid argument: callback");
3131
if(options.watch === true) {
32-
console.warn("options.watch and options.watchDelay is deprecated: use webpack(options).watch instead");
33-
var watchOptions = options.watch || !Array.isArray(options) ? options : options[0];
34-
watchOptions = {
35-
aggregateTimeout: watchOptions.watchDelay
36-
};
32+
var watchOptions = (!Array.isArray(options) ? options : options[0]).watchOptions || {};
33+
// TODO remove this in next major version
34+
var watchDelay = (!Array.isArray(options) ? options : options[0]).watchDelay;
35+
if(watchDelay) {
36+
console.warn("options.watchDelay is deprecated: Use 'options.watchOptions.aggregateTimeout' instead");
37+
watchOptions.aggregateTimeout = watchDelay;
38+
}
3739
return compiler.watch(watchOptions, callback);
3840
}
3941
compiler.run(callback);

0 commit comments

Comments
 (0)