Merge pull request #172 from maier49/fix-chunk-emit

Emit `registerAbsMids` call before chunk code
OpenNTF · Jul 26, 2018 · ba87817 · ba87817
2 parents 3123e11 + fce44ac
commit ba87817
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/DojoAMDChunkTemplatePlugin.js b/lib/DojoAMDChunkTemplatePlugin.js
@@ -23,6 +23,7 @@
 
 const {reg, tap, callSyncWaterfall} = require("webpack-plugin-compat").for("dojo-webpack-plugin");
 const {getIndent, getAsString, modulesFromChunk} = require("./compat");
+const {ConcatSource} = require('webpack-sources');
 
 module.exports = class DojoAMDChunkTemplatePlugin {
 	constructor(options) {
@@ -52,14 +53,12 @@ module.exports = class DojoAMDChunkTemplatePlugin {
 		const jsonpFn = JSON.stringify(chunkTemplate.outputOptions.jsonpFunction);
 
 		const buf = [];
-		buf.push(";");
 		buf.push("(function(){");
 		buf.push(`(this||window)[${jsonpFn}].registerAbsMids({`);
 		buf.push(callSyncWaterfall(chunkTemplate, "render absMids", "", chunk));
 		buf.push("})");
-		buf.push("})()");
-		source.add(this.asString(buf));
-		return source;
+		buf.push("})(),");
+		return new ConcatSource(this.asString(buf), source);
 	}
 
 	renderAbsMids(source, chunk) {