Skip to content

Commit a0394a0

Browse files
sokrasokra
committed
refactored ChunkTemplate with plugin interface
1 parent a8c7dc2 commit a0394a0

12 files changed

Lines changed: 89 additions & 115 deletions

‎lib/ChunkTemplate.js‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MIT License http://www.opensource.org/licenses/mit-license.php
33
Author Tobias Koppers @sokra
44
*/
5-
var ConcatSource = require("webpack-core/lib/ConcatSource");
65
var Template = require("./Template");
76

87
function ChunkTemplate(outputOptions) {
@@ -13,23 +12,15 @@ module.exports = ChunkTemplate;
1312

1413
ChunkTemplate.prototype = Object.create(Template.prototype);
1514
ChunkTemplate.prototype.render = function(chunk, moduleTemplate, dependencyTemplates) {
16-
var source = new ConcatSource();
17-
source.add(this.asString(this.renderHeader(chunk)));
18-
source.add(this.renderChunkModules(chunk, moduleTemplate, dependencyTemplates));
19-
source.add(this.asString(this.renderFooter(chunk)));
15+
var modules = this.renderChunkModules(chunk, moduleTemplate, dependencyTemplates);
16+
var core = this.applyPluginsWaterfall("modules", modules, chunk, moduleTemplate, dependencyTemplates);
17+
var source = this.applyPluginsWaterfall("render", core, chunk, moduleTemplate, dependencyTemplates);
2018
chunk.rendered = true;
2119
return source;
2220
};
2321

24-
ChunkTemplate.prototype.renderHeader = function(chunk) {
25-
return [];
26-
};
27-
28-
ChunkTemplate.prototype.renderFooter = function(chunk) {
29-
return [];
30-
};
31-
3222
ChunkTemplate.prototype.updateHash = function(hash) {
3323
hash.update("ChunkTemplate");
3424
hash.update("2");
25+
this.applyPlugins("hash", hash);
3526
};

‎lib/Compilation.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ var Chunk = require("./Chunk");
1616
var Stats = require("./Stats");
1717
var Template = require("./Template");
1818
var MainTemplate = require("./MainTemplate");
19+
var ChunkTemplate = require("./ChunkTemplate");
1920

2021
function Compilation(compiler) {
2122
Tapable.call(this);
@@ -29,7 +30,7 @@ function Compilation(compiler) {
2930
this.profile = options && options.profile;
3031

3132
this.mainTemplate = new MainTemplate(this.outputOptions);
32-
this.chunkTemplate = compiler.chunkTemplate;
33+
this.chunkTemplate = new ChunkTemplate(this.outputOptions);
3334
this.hotUpdateChunkTemplate = compiler.hotUpdateChunkTemplate;
3435
this.moduleTemplate = compiler.moduleTemplate;
3536

‎lib/Compiler.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Watching.prototype.close = function(callback) {
122122

123123
function Compiler() {
124124
Tapable.call(this);
125-
this.chunkTemplate = this.moduleTemplate = null;
125+
this.moduleTemplate = null;
126126

127127
this.outputPath = "";
128128
this.outputFileSystem = null;
@@ -309,7 +309,6 @@ Compiler.prototype.createChildCompiler = function(compilation, compilerName, out
309309
childCompiler._plugins[name] = this._plugins[name].slice();
310310
}
311311
childCompiler.name = compilerName;
312-
childCompiler.chunkTemplate = this.chunkTemplate;
313312
childCompiler.moduleTemplate = this.moduleTemplate;
314313
childCompiler.outputPath = this.outputPath;
315314
childCompiler.inputFileSystem = this.inputFileSystem;

‎lib/JsonpChunkTemplate.js‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎lib/JsonpChunkTemplatePlugin.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Tobias Koppers @sokra
4+
*/
5+
var ConcatSource = require("webpack-core/lib/ConcatSource");
6+
7+
function JsonpChunkTemplatePlugin() {
8+
}
9+
module.exports = JsonpChunkTemplatePlugin;
10+
11+
JsonpChunkTemplatePlugin.prototype.apply = function(chunkTemplate) {
12+
chunkTemplate.plugin("render", function(modules, chunk) {
13+
var jsonpFunction = this.outputOptions.jsonpFunction || ("webpackJsonp" + (this.outputOptions.library || ""));
14+
var source = new ConcatSource();
15+
source.add(jsonpFunction + "(" + JSON.stringify(chunk.ids) + ",");
16+
source.add(modules);
17+
source.add(");");
18+
return source;
19+
});
20+
chunkTemplate.plugin("hash", function(hash) {
21+
hash.update("JsonpChunkTemplatePlugin");
22+
hash.update("3");
23+
hash.update(this.outputOptions.jsonpFunction + "");
24+
hash.update(this.outputOptions.library + "");
25+
});
26+
};

‎lib/JsonpTemplatePlugin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Author Tobias Koppers @sokra
44
*/
55
var JsonpMainTemplatePlugin = require("./JsonpMainTemplatePlugin");
6-
var JsonpChunkTemplate = require("./JsonpChunkTemplate");
6+
var JsonpChunkTemplatePlugin = require("./JsonpChunkTemplatePlugin");
77
var JsonpHotUpdateChunkTemplate = require("./JsonpHotUpdateChunkTemplate");
88

99
function JsonpTemplatePlugin(options) {
@@ -14,7 +14,7 @@ JsonpTemplatePlugin.prototype.apply = function(compiler) {
1414
var options = this.options;
1515
compiler.plugin("this-compilation", function(compilation) {
1616
compilation.mainTemplate.apply(new JsonpMainTemplatePlugin());
17+
compilation.chunkTemplate.apply(new JsonpChunkTemplatePlugin());
1718
});
18-
compiler.chunkTemplate = new JsonpChunkTemplate(options);
1919
compiler.hotUpdateChunkTemplate = new JsonpHotUpdateChunkTemplate(options);
2020
};

‎lib/node/NodeChunkTemplate.js‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎lib/node/NodeChunkTemplatePlugin.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Tobias Koppers @sokra
4+
*/
5+
var ConcatSource = require("webpack-core/lib/ConcatSource");
6+
7+
function NodeChunkTemplatePlugin() {
8+
}
9+
module.exports = NodeChunkTemplatePlugin;
10+
11+
NodeChunkTemplatePlugin.prototype.apply = function(chunkTemplate) {
12+
chunkTemplate.plugin("render", function(modules, chunk) {
13+
var source = new ConcatSource();
14+
source.add("exports.ids = " + JSON.stringify(chunk.ids) + ";\nexports.modules = ");
15+
source.add(modules);
16+
source.add(";");
17+
return source;
18+
});
19+
chunkTemplate.plugin("hash", function(hash) {
20+
hash.update("node");
21+
hash.update("3");
22+
});
23+
};

‎lib/node/NodeTemplatePlugin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Author Tobias Koppers @sokra
44
*/
55
var NodeMainTemplatePlugin = require("./NodeMainTemplatePlugin");
6-
var NodeChunkTemplate = require("./NodeChunkTemplate");
6+
var NodeChunkTemplatePlugin = require("./NodeChunkTemplatePlugin");
77
var NodeHotUpdateChunkTemplate = require("./NodeHotUpdateChunkTemplate");
88

99
function NodeTemplatePlugin(options, asyncChunkLoading) {
@@ -15,7 +15,7 @@ NodeTemplatePlugin.prototype.apply = function(compiler) {
1515
var options = this.options;
1616
compiler.plugin("this-compilation", function(compilation) {
1717
compilation.mainTemplate.apply(new NodeMainTemplatePlugin(this.asyncChunkLoading));
18+
compilation.chunkTemplate.apply(new NodeChunkTemplatePlugin());
1819
}.bind(this));
19-
compiler.chunkTemplate = new NodeChunkTemplate(options);
2020
compiler.hotUpdateChunkTemplate = new NodeHotUpdateChunkTemplate(options);
2121
};

‎lib/webworker/WebWorkerChunkTemplate.js‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)