root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2714 from impl/fix-dynamic-system.import-hot 

Fix issue with async dynamic System.import dependencies not being re-emitted
This commit is contained in:
Tobias Koppers 2016-06-28 22:32:25 +02:00 committed by GitHub
parent e9b985c852 ab9aef1140
commit 4eea96946e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ContextModule.js
View File

@ -5,7 +5,7 @@
var Module = require("./Module");
var OriginalSource = require("webpack-sources").OriginalSource;
var RawSource = require("webpack-sources").RawSource;
var DependenciesBlock = require("./DependenciesBlock");
var AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
function ContextModule(resolveDependencies, context, recursive, regExp, addon, async) {
Module.call(this);
@ -80,12 +80,13 @@ ContextModule.prototype.build = function(options, compilation, resolver, fs, cal
});
}
if(this.async) {
this.blocks = dependencies && dependencies.map(function(dep) {
var block = new DependenciesBlock();
block.parent = this;
block.dependencies = [dep];
return block;
}, this);
if(dependencies) {
dependencies.forEach(function(dep) {
var block = new AsyncDependenciesBlock(null, dep.module, dep.loc);
block.addDependency(dep);
this.addBlock(block);
}, this);
}
} else {
this.dependencies = dependencies;
}