Skip to content

Commit 4a52440

Browse files
committed
track dependencies even if error occur
fixes webpack#1975 merged webpack#1985
1 parent 8cb0ee7 commit 4a52440

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

lib/NormalModule.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ NormalModule.prototype.doBuild = function doBuild(options, compilation, resolver
128128
context: loaderContext,
129129
readResource: fs.readFile.bind(fs)
130130
}, function(err, result) {
131+
if(result) {
132+
module.cacheable = result.cacheable;
133+
module.fileDependencies = result.fileDependencies;
134+
module.contextDependencies = result.contextDependencies;
135+
}
131136
if(err) {
132137
module.error = err;
133138
return callback(new ModuleBuildError(module, err));
@@ -136,9 +141,6 @@ NormalModule.prototype.doBuild = function doBuild(options, compilation, resolver
136141
var resourceBuffer = result.resourceBuffer;
137142
var source = result.result[0];
138143
var sourceMap = result.result[1];
139-
module.cacheable = result.cacheable;
140-
module.fileDependencies = result.fileDependencies;
141-
module.contextDependencies = result.contextDependencies;
142144

143145
if(!Buffer.isBuffer(source) && typeof source !== "string") {
144146
module.error = new Error("Final loader didn't return a Buffer or String");
@@ -156,7 +158,7 @@ NormalModule.prototype.doBuild = function doBuild(options, compilation, resolver
156158
module._source = new RawSource(source);
157159
}
158160
return callback();
159-
})
161+
});
160162
};
161163

162164
NormalModule.prototype.disconnect = function disconnect() {

0 commit comments

Comments
 (0)