Merge pull request #303 from chuckdumont/work2

Don't require that entry bundles be loaded first

Author: Chuck Dumont

lib/DojoAMDChunkTemplatePlugin.js

@@ -56,9 +56,17 @@ module.exports = class DojoAMDChunkTemplatePlugin {
 
 		const buf = [];
 		buf.push("(function(){");
-		buf.push(`(this||window)[${jsonpFn}].registerAbsMids({`);
+		buf.push(`var absMids = {`);
 		buf.push(callSyncWaterfall(chunkTemplate, "render absMids", "", chunk));
-		buf.push("})");
+		buf.push("};");
+		buf.push("var globalObj = this||window;");
+		buf.push(`var jsonpArray = globalObj[${jsonpFn}] = globalObj[${jsonpFn}] || [];`);
+		buf.push("if (jsonpArray.registerAbsMids) {");
+		buf.push("   jsonpArray.registerAbsMids(absMids);");
+		buf.push("} else {");
+		buf.push("   var absMidsWaiting = jsonpArray.absMidsWaiting = jsonpArray.absMidsWaiting || [];");
+		buf.push("   absMidsWaiting.push(absMids);");
+		buf.push("}");
 		buf.push("})(),");
 		return new ConcatSource(this.asString(buf), source);
 	}
@@ -94,6 +102,6 @@ module.exports = class DojoAMDChunkTemplatePlugin {
 
 	hash(hash) {
 		hash.update("DojoAMDChunkTemplate");
-		hash.update("3");		// Increment this whenever the template code above changes
+		hash.update("4");		// Increment this whenever the template code above changes
 	}
 };

lib/DojoAMDMainTemplatePlugin.js

@@ -93,6 +93,7 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		const [runtimeSource, asyncSource] = ['main', 'async'].map(type => Template.getFunctionContent(runtime[type])
 		                           .replace(/__webpack_require__/g, mainTemplate.requireFn)
 		                           .replace(/__async__/g, (!!this.options.async).toString()));
+		const jsonpFn = JSON.stringify(mainTemplate.outputOptions.jsonpFunction);
 		const buf = [];
 		buf.push(runtimeSource);
 		if (this.options.async) {
@@ -105,7 +106,6 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		buf.push("");
 		buf.push((callSyncWaterfall(mainTemplate, "dojo-global-require", "globalObj.require = req;")));
 		if(needChunkLoadingCode(chunk)) {
-			const jsonpFn = JSON.stringify(mainTemplate.outputOptions.jsonpFunction);
 			buf.push(this.indent(
 				`(this||window)[${jsonpFn}].registerAbsMids = registerAbsMids;`
 			));
@@ -170,6 +170,13 @@ but the loader specified at ${this.embeddedLoaderFilename} was built without the
 		if (loaderConfig.has && loaderConfig.has['dojo-undef-api']) {
 			buf.push("req.undef = " +  Template.getFunctionContent(runtime.undef));
 		}
+		if(needChunkLoadingCode(chunk)) {
+			buf.push(`var absMidsWaiting = globalObj[${jsonpFn}].absMidsWaiting;`);
+			buf.push("if (absMidsWaiting) {");
+			buf.push("   absMidsWaiting.forEach(registerAbsMids);");
+			buf.push(`   delete globalObj[${jsonpFn}].absMidsWaiting;`);
+			buf.push("}");
+		}
 		const makeDeprecatedReq = Template.getFunctionContent(runtime.makeDeprecatedReq)
 		                                .replace(/__webpack_require__\.dj/g, djProp);
 		return this.asString([
@@ -230,7 +237,7 @@ but the loader specified at ${this.embeddedLoaderFilename} was built without the
 	hash(hash) {
 		const {options} = this;
 		hash.update("DojoAMDMainTemplate");
-		hash.update("11");		// Increment this whenever the template code above changes
+		hash.update("12");		// Increment this whenever the template code above changes
 		if (util.isString(options.loaderConfig)) {
 			hash.update(options.loaderConfig);	// loading the config as a module, so any any changes to the
 																					//   content will be detected at the module level