Skip to content

Commit b0f5575

Browse files
committed
added async chunk loading for node.js build
1 parent d614f95 commit b0f5575

File tree

3 files changed

+63
-22
lines changed

3 files changed

+63
-22
lines changed

lib/WebpackOptionsApply.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,11 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
7878
);
7979
break;
8080
case "node":
81+
case "async-node":
8182
var NodeTemplatePlugin = require("./node/NodeTemplatePlugin");
8283
var NodeTargetPlugin = require("./node/NodeTargetPlugin");
8384
compiler.apply(
84-
new NodeTemplatePlugin(options.output),
85+
new NodeTemplatePlugin(options.output, options.target === "async-node"),
8586
new FunctionModulePlugin(options.context, options.output),
8687
new NodeTargetPlugin()
8788
);

lib/node/NodeMainTemplate.js

Lines changed: 58 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
var MainTemplate = require("../MainTemplate");
66
var Template = require("../Template");
77

8-
function NodeMainTemplate(outputOptions) {
8+
function NodeMainTemplate(outputOptions, asyncChunkLoading) {
99
MainTemplate.call(this, outputOptions);
10+
this.asyncChunkLoading = asyncChunkLoading;
1011
}
1112
module.exports = NodeMainTemplate;
1213

@@ -35,25 +36,63 @@ NodeMainTemplate.prototype.renderLocalVars = function(hash, chunk) {
3536
NodeMainTemplate.prototype.renderRequireEnsure = function(hash, chunk) {
3637
var filename = this.outputOptions.filename || "bundle.js";
3738
var chunkFilename = this.outputOptions.chunkFilename || "[id]." + filename;
38-
return [
39-
"// \"1\" is the signal for \"already loaded\"",
40-
"if(!installedChunks[chunkId]) {",
41-
this.indent([
42-
"var chunk = require(" +
43-
JSON.stringify("./" + chunkFilename
44-
.replace(Template.REGEXP_HASH, hash)
45-
.replace(Template.REGEXP_NAME, ""))
46-
.replace(Template.REGEXP_ID, "\" + chunkId + \"") + ");",
47-
"var moreModules = chunk.modules, chunkIds = chunk.ids;",
48-
"for(var moduleId in moreModules) {",
49-
this.indent(this.renderAddModule(hash, chunk, "moduleId", "moreModules[moduleId]")),
50-
"}",
51-
"for(var i = 0; i < chunkIds.length; i++)",
52-
this.indent("installedChunks[chunkIds[i]] = 1;"),
53-
]),
54-
"}",
55-
"callback.call(null, " + this.requireFn + ");",
39+
var insertMoreModules = [
40+
"var moreModules = chunk.modules, chunkIds = chunk.ids;",
41+
"for(var moduleId in moreModules) {",
42+
this.indent(this.renderAddModule(hash, chunk, "moduleId", "moreModules[moduleId]")),
43+
"}"
5644
];
45+
if(this.asyncChunkLoading) {
46+
return [
47+
"if(installedChunks[chunkId] === 1) callback.call(null, " + this.requireFn + ");",
48+
"else if(!installedChunks[chunkId]) {",
49+
this.indent([
50+
"installedChunks[chunkId] = [callback];",
51+
"var filename = __dirname + " + JSON.stringify("/" + chunkFilename
52+
.replace(Template.REGEXP_HASH, hash)
53+
.replace(Template.REGEXP_NAME, ""))
54+
.replace(Template.REGEXP_ID, "\" + chunkId + \"") + ";",
55+
"require('fs').readFile(filename, 'utf-8', function(err, content) {",
56+
this.indent([
57+
"if(err) { if(" + this.requireFn + ".onerror) return " + this.requireFn + ".onerror(err); else throw err; }",
58+
"var chunk = {};",
59+
"require('vm').runInThisContext('(function(exports) {' + content + '\\n})', filename)(chunk);",
60+
].concat(insertMoreModules).concat([
61+
"var callbacks = [];",
62+
"for(var i = 0; i < chunkIds.length; i++) {",
63+
this.indent([
64+
"if(Array.isArray(installedChunks[chunkIds[i]]))",
65+
this.indent([
66+
"callbacks = callbacks.concat(installedChunks[chunkIds[i]]);"
67+
]),
68+
"installedChunks[chunkIds[i]] = 1;"
69+
]),
70+
"}",
71+
"for(i = 0; i < callbacks.length; i++)",
72+
this.indent("callbacks[i].call(null, " + this.requireFn + ");")
73+
])),
74+
"});"
75+
]),
76+
"} else installedChunks[chunkId].push(callback);",
77+
];
78+
} else {
79+
return [
80+
"// \"1\" is the signal for \"already loaded\"",
81+
"if(!installedChunks[chunkId]) {",
82+
this.indent([
83+
"var chunk = require(" +
84+
JSON.stringify("./" + chunkFilename
85+
.replace(Template.REGEXP_HASH, hash)
86+
.replace(Template.REGEXP_NAME, ""))
87+
.replace(Template.REGEXP_ID, "\" + chunkId + \"") + ");"
88+
].concat(insertMoreModules).concat([
89+
"for(var i = 0; i < chunkIds.length; i++)",
90+
this.indent("installedChunks[chunkIds[i]] = 1;"),
91+
])),
92+
"}",
93+
"callback.call(null, " + this.requireFn + ");",
94+
];
95+
}
5796
};
5897

5998
NodeMainTemplate.prototype.renderRequireExtensions = function(hash, chunk) {

lib/node/NodeTemplatePlugin.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
var NodeMainTemplate = require("./NodeMainTemplate");
66
var NodeChunkTemplate = require("./NodeChunkTemplate");
77

8-
function NodeTemplatePlugin(options) {
8+
function NodeTemplatePlugin(options, asyncChunkLoading) {
99
this.options = options;
10+
this.asyncChunkLoading = asyncChunkLoading;
1011
}
1112
module.exports = NodeTemplatePlugin;
1213
NodeTemplatePlugin.prototype.apply = function(compiler) {
1314
var options = this.options;
14-
compiler.mainTemplate = new NodeMainTemplate(options);
15+
compiler.mainTemplate = new NodeMainTemplate(options, this.asyncChunkLoading);
1516
compiler.chunkTemplate = new NodeChunkTemplate(options);
1617
compiler.plugin("compilation", function(compilation) {
1718
compilation.plugin("normal-module-loader", function(loaderContext) {

0 commit comments

Comments
 (0)