Skip to content

Commit ab149eb

Browse files
sokrasokra
committed
Merge branch 'hot-multi-pass' of https://github.com/webpack/webpack.git into webpack-2
Conflicts: lib/Compilation.js
2 parents ff4585b + 39c370a commit ab149eb

5 files changed

Lines changed: 78 additions & 15 deletions

File tree

‎lib/Compilation.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,12 @@ Compilation.prototype.seal = function seal(callback) {
524524
this.applyPlugins("before-hash");
525525
this.createHash();
526526
this.applyPlugins("after-hash");
527-
this.applyPlugins("before-chunk-assets");
528-
this.createChunkAssets();
527+
this.applyPlugins("before-module-assets");
528+
this.createModuleAssets();
529+
if(this.applyPluginsBailResult("should-generate-chunk-assets") !== false) {
530+
this.applyPlugins("before-chunk-assets");
531+
this.createChunkAssets();
532+
}
529533
this.applyPlugins("additional-chunk-assets", this.chunks);
530534
this.summarizeDependencies();
531535
if(shouldRecord)
@@ -751,10 +755,7 @@ Compilation.prototype.modifyHash = function modifyHash(update) {
751755
this.hash = this.fullHash.substr(0, hashDigestLength);
752756
};
753757

754-
Compilation.prototype.createChunkAssets = function createChunkAssets() {
755-
var outputOptions = this.outputOptions;
756-
var filename = outputOptions.filename || "bundle.js";
757-
var chunkFilename = outputOptions.chunkFilename || "[id]." + filename;
758+
Compilation.prototype.createModuleAssets = function createModuleAssets() {
758759
for(var i = 0; i < this.modules.length; i++) {
759760
var module = this.modules[i];
760761
if(module.assets) {
@@ -765,6 +766,12 @@ Compilation.prototype.createChunkAssets = function createChunkAssets() {
765766
}, this);
766767
}
767768
}
769+
};
770+
771+
Compilation.prototype.createChunkAssets = function createChunkAssets() {
772+
var outputOptions = this.outputOptions;
773+
var filename = outputOptions.filename || "bundle.js";
774+
var chunkFilename = outputOptions.chunkFilename || "[id]." + filename;
768775
for(var i = 0; i < this.chunks.length; i++) {
769776
var chunk = this.chunks[i];
770777
chunk.files = [];

‎lib/Compiler.js‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Watching.prototype._go = function() {
4242
this.running = true;
4343
this.invalid = false;
4444
this.compiler.applyPluginsAsync("watch-run", this, function(err) {
45-
this.compiler.compile(function(err, compilation) {
45+
this.compiler.compile(function onCompiled(err, compilation) {
4646
if(err) return this._done(err);
4747
if(this.invalid) return this._done();
4848

@@ -57,6 +57,20 @@ Watching.prototype._go = function() {
5757
this.compiler.emitRecords(function(err) {
5858
if(err) return this._done(err);
5959

60+
if(compilation.applyPluginsBailResult("need-additional-pass")) {
61+
compilation.needAdditionalPass = true;
62+
63+
var stats = compilation.getStats();
64+
stats.startTime = this.startTime;
65+
stats.endTime = new Date().getTime();
66+
this.compiler.applyPlugins("done", stats);
67+
68+
this.compiler.applyPluginsAsync("additional-pass", function(err) {
69+
if(err) return this._done(err);
70+
this.compiler.compile(onCompiled.bind(this));
71+
}.bind(this));
72+
return;
73+
}
6074
return this._done(null, compilation);
6175
}.bind(this));
6276
}.bind(this));
@@ -168,7 +182,7 @@ Compiler.prototype.run = function(callback) {
168182
this.readRecords(function(err) {
169183
if(err) return callback(err);
170184

171-
this.compile(function(err, compilation) {
185+
this.compile(function onCompiled(err, compilation) {
172186
if(err) return callback(err);
173187

174188
if(this.applyPluginsBailResult("should-emit", compilation) === false) {
@@ -182,6 +196,21 @@ Compiler.prototype.run = function(callback) {
182196
this.emitAssets(compilation, function(err) {
183197
if(err) return callback(err);
184198

199+
if(compilation.applyPluginsBailResult("need-additional-pass")) {
200+
compilation.needAdditionalPass = true;
201+
202+
var stats = compilation.getStats();
203+
stats.startTime = startTime;
204+
stats.endTime = new Date().getTime();
205+
this.applyPlugins("done", stats);
206+
207+
this.applyPluginsAsync("additional-pass", function(err) {
208+
if(err) return callback(err);
209+
this.compile(onCompiled.bind(this));
210+
}.bind(this));
211+
return;
212+
}
213+
185214
this.emitRecords(function(err) {
186215
if(err) return callback(err);
187216

‎lib/HotModuleReplacementPlugin.js‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ var RawSource = require("webpack-core/lib/RawSource");
1010
var ConstDependency = require("./dependencies/ConstDependency");
1111
var NullFactory = require("./NullFactory");
1212

13-
function HotModuleReplacementPlugin() {
13+
function HotModuleReplacementPlugin(options) {
14+
options = options || {};
15+
this.multiStep = options.multiStep;
1416
}
1517
module.exports = HotModuleReplacementPlugin;
1618

1719
HotModuleReplacementPlugin.prototype.apply = function(compiler) {
20+
var multiStep = this.multiStep;
1821
var hotUpdateChunkFilename = compiler.options.output.hotUpdateChunkFilename;
1922
var hotUpdateMainFilename = compiler.options.output.hotUpdateMainFilename;
2023
compiler.plugin("compilation", function(compilation, params) {
@@ -52,20 +55,33 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
5255
records.chunkModuleIds[chunk.id] = chunk.modules.map(function(m) { return m.id; });
5356
});
5457
});
58+
var initialPass = false;
59+
var recompilation = false;
5560
compilation.plugin("after-hash", function() {
5661
var records = this.records;
57-
if(!records) return;
62+
if(!records) return initialPass = true;
63+
if(!records.hash)
64+
initialPass = true;
5865
var lastHash = records.hash || "x";
5966
var preHash = records.preHash || "x";
6067
var prepreHash = records.prepreHash || "x";
6168
if(preHash === this.hash) {
69+
recompilation = true;
6270
this.modifyHash(prepreHash);
6371
return;
6472
}
6573
records.prepreHash = records.hash || "x";
6674
records.preHash = this.hash;
6775
this.modifyHash(records.prepreHash);
6876
});
77+
compilation.plugin("should-generate-chunk-assets", function() {
78+
if(multiStep && !recompilation && !initialPass)
79+
return false;
80+
});
81+
compilation.plugin("need-additional-pass", function() {
82+
if(multiStep && !recompilation && !initialPass)
83+
return true;
84+
});
6985
compilation.plugin("additional-chunk-assets", function() {
7086
var records = this.records;
7187
if(records.hash === this.hash) return;
@@ -184,7 +200,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
184200
params = [arg];
185201
}
186202
if(arg.isArray()){
187-
params = arg.items.filter(function(param) {
203+
params = arg.items.filter(function(param) {
188204
return param.isString();
189205
});
190206
}
@@ -437,11 +453,11 @@ var hotInitCode = Template.getFunctionContent(function() {
437453
options = {};
438454
callback = callback || function(err) { if(err) throw err };
439455
}
440-
456+
441457
function getAffectedStuff(module) {
442458
var outdatedModules = [module];
443459
var outdatedDependencies = {};
444-
460+
445461
var queue = outdatedModules.slice();
446462
while(queue.length > 0) {
447463
var moduleId = queue.pop();
@@ -472,7 +488,7 @@ var hotInitCode = Template.getFunctionContent(function() {
472488
queue.push(parentId);
473489
}
474490
}
475-
491+
476492
return [outdatedModules, outdatedDependencies];
477493
}
478494
function addAllToSet(a, b) {

‎lib/Stats.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ Stats.prototype.toJson = function toJson(options, forToString) {
108108
if(showTimings && this.startTime && this.endTime) {
109109
obj.time = this.endTime - this.startTime;
110110
}
111+
if(compilation.needAdditionalPass) {
112+
obj.needAdditionalPass = true
113+
}
111114
if(showAssets) {
112115
var assetsByFile = {};
113116
obj.assetsByChunkName = {};
@@ -617,6 +620,9 @@ Stats.jsonToString = function jsonToString(obj, useColors) {
617620
newline();
618621
});
619622
}
623+
if(obj.needAdditionalPass) {
624+
yellow("Compilation needs an additional pass and will compile again.");
625+
}
620626

621627
while(buf[buf.length-1] === "\n") buf.pop();
622628
return buf.join("");

‎test/TestCases.test.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ describe("TestCases", function() {
2323
{ name: "hot", plugins: [
2424
new webpack.HotModuleReplacementPlugin()
2525
]},
26+
{ name: "hot-multi-step", plugins: [
27+
new webpack.HotModuleReplacementPlugin({
28+
multiStep: true
29+
})
30+
]},
2631
{ name: "devtool-eval", devtool: "eval" },
2732
{ name: "devtool-eval-source-map", devtool: "#eval-source-map" },
2833
{ name: "devtool-inline-source-map", devtool: "inline-source-map" },
@@ -128,4 +133,4 @@ describe("TestCases", function() {
128133
});
129134
});
130135
});
131-
});
136+
});

0 commit comments

Comments
 (0)