Skip to content

Commit adfcfce

Browse files
sokrasokra
committed
watching of missing files, fixed webpack#668
store missing files from errors for missingDependencies make the new watching plugins default added OldWatchingPlugin
1 parent 6bba5ce commit adfcfce

14 files changed

Lines changed: 377 additions & 303 deletions

‎lib/Compilation.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,11 @@ Compilation.prototype.summarizeDependencies = function summarizeDependencies() {
668668
}
669669
this.fileDependencies = [];
670670
this.contextDependencies = [];
671+
this.missingDependencies = [];
671672
this.children.forEach(function(child) {
672673
this.fileDependencies = this.fileDependencies.concat(child.fileDependencies);
673674
this.contextDependencies = this.contextDependencies.concat(child.contextDependencies);
675+
this.missingDependencies = this.missingDependencies.concat(child.missingDependencies);
674676
}.bind(this));
675677
this.modules.forEach(function(module) {
676678
if(module.fileDependencies) {
@@ -684,10 +686,19 @@ Compilation.prototype.summarizeDependencies = function summarizeDependencies() {
684686
}, this);
685687
}
686688
}, this);
689+
this.errors.forEach(function(error) {
690+
if(Array.isArray(error.missing)) {
691+
error.missing.forEach(function(item) {
692+
this.missingDependencies.push(item);
693+
}, this)
694+
}
695+
}, this);
687696
this.fileDependencies.sort();
688697
this.fileDependencies = filterDups(this.fileDependencies);
689698
this.contextDependencies.sort();
690699
this.contextDependencies = filterDups(this.contextDependencies);
700+
this.missingDependencies.sort();
701+
this.missingDependencies = filterDups(this.missingDependencies);
691702
};
692703

693704
Compilation.prototype.createHash = function createHash() {

‎lib/Compiler.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ Watching.prototype._done = function(err, compilation) {
8080
this.compiler.applyPlugins("failed", this.error);
8181
this.handler(this.error, this.stats);
8282
if(!this.error)
83-
this.watch(compilation.fileDependencies, compilation.contextDependencies);
83+
this.watch(compilation.fileDependencies, compilation.contextDependencies, compilation.missingDependencies);
8484
};
8585

86-
Watching.prototype.watch = function(files, dirs) {
87-
this.watcher = this.compiler.watchFileSystem.watch(files, dirs, this.startTime, this.watchDelay, function(err, filesModified, contextModified, fileTimestamps, contextTimestamps) {
86+
Watching.prototype.watch = function(files, dirs, missing) {
87+
this.watcher = this.compiler.watchFileSystem.watch(files, dirs, missing, this.startTime, this.watchDelay, function(err, filesModified, contextModified, missingModified, fileTimestamps, contextTimestamps) {
8888
this.watcher = null;
8989
if(err) return this.handler(err);
9090

@@ -98,7 +98,7 @@ Watching.prototype.watch = function(files, dirs) {
9898

9999
Watching.prototype.invalidate = function() {
100100
if(this.watcher) {
101-
this.watcher.close();
101+
this.watcher.pause();
102102
this.watcher = null;
103103
}
104104
if(this.running) {

‎lib/ModuleNotFoundError.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ function ModuleNotFoundError(module, err) {
88
this.name = "ModuleNotFoundError";
99
this.message = "Module not found: " + err;
1010
this.details = err.details;
11+
this.missing = err.missing;
1112
this.module = module;
1213
this.error = err;
1314
}

‎lib/NewWatchingPlugin.js‎

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,12 @@
22
MIT License http://www.opensource.org/licenses/mit-license.php
33
Author Tobias Koppers @sokra
44
*/
5-
var Watchpack = require("watchpack");
6-
75
function NewWatchingPlugin() {
86
}
97
module.exports = NewWatchingPlugin;
108

119
NewWatchingPlugin.prototype.apply = function(compiler) {
12-
compiler.plugin("environment", function() {
13-
compiler.watchFileSystem = new NodeWatchFileSystem(compiler.inputFileSystem);
10+
compiler.plugin("compilation", function(compilation) {
11+
compilation.warnings.push(new Error("The 'NewWatchingPlugin' is no longer necessary (now default)"));
1412
});
1513
};
16-
17-
function NodeWatchFileSystem(inputFileSystem) {
18-
this.inputFileSystem = inputFileSystem;
19-
this.watcherOptions = {
20-
aggregateTimeout: 0
21-
};
22-
this.watcher = new Watchpack(this.watcherOptions);
23-
}
24-
25-
NodeWatchFileSystem.prototype.watch = function watch(files, dirs, startTime, delay, callback, callbackUndelayed) {
26-
var oldWatcher = this.watcher;
27-
this.watcher = new Watchpack({
28-
aggregateTimeout: delay
29-
});
30-
31-
var onChange = function() {
32-
callbackUndelayed();
33-
}.bind(this);
34-
this.watcher.once("change", onChange);
35-
this.watcher.once("aggregated", function(changes) {
36-
if(this.inputFileSystem && this.inputFileSystem.purge) {
37-
this.inputFileSystem.purge(changes);
38-
}
39-
var times = this.watcher.getTimes();
40-
callback(null, changes.filter(function(file) {
41-
return files.indexOf(file) >= 0;
42-
}).sort(), changes.filter(function(file) {
43-
return dirs.indexOf(file) >= 0;
44-
}).sort(), times, times);
45-
}.bind(this));
46-
47-
this.watcher.watch(files, dirs, startTime);
48-
49-
if(oldWatcher) {
50-
oldWatcher.close();
51-
}
52-
return {
53-
close: function() {
54-
this.watcher.pause();
55-
}.bind(this)
56-
}
57-
};

‎lib/OldWatchingPlugin.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Tobias Koppers @sokra
4+
*/
5+
var OldNodeWatchFileSystem = require("./node/OldNodeWatchFileSystem");
6+
7+
function OldWatchingPlugin() {
8+
}
9+
module.exports = OldWatchingPlugin;
10+
11+
OldWatchingPlugin.prototype.apply = function(compiler) {
12+
compiler.plugin("environment", function() {
13+
compiler.watchFileSystem = new OldNodeWatchFileSystem(compiler.inputFileSystem);
14+
});
15+
};

‎lib/Stats.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Stats.prototype.toJson = function toJson(options, forToString) {
4444
var sortModules = d(options.modulesSort, "id");
4545
var sortChunks = d(options.chunksSort, "id");
4646
var sortAssets = d(options.assetsSort, "");
47-
47+
4848
function moduleFilter(module) {
4949
if(!showCachedModules && !module.built) {
5050
return false;
@@ -80,6 +80,9 @@ Stats.prototype.toJson = function toJson(options, forToString) {
8080
}
8181
text += e.message;
8282
if(showErrorDetails && e.details) text += "\n" + e.details;
83+
if(showErrorDetails && e.missing) text += e.missing.map(function(item) {
84+
return "\n[" + item + "]";
85+
}).join("");
8386
if(e.dependencies && e.origin) {
8487
text += "\n @ " + e.origin.readableIdentifier(requestShortener);
8588
e.dependencies.forEach(function(dep) {
@@ -608,4 +611,4 @@ Stats.jsonToString = function jsonToString(obj, useColors) {
608611

609612
while(buf[buf.length-1] === "\n") buf.pop();
610613
return buf.join("");
611-
};
614+
};

0 commit comments

Comments
 (0)