Merge pull request #27 from chuckdumont/work

Try again to fix build errors when using ExtractTextPlugin

Author: Chuck Dumont

lib/DojoAMDMainTemplatePlugin.js

@@ -122,17 +122,7 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			}
 		}
 
-		function hasAMD(chunk) {
-			var modules = chunk.getModules ? chunk.getModules() : chunk.modules;
-			return modules.some((module) => {
-				return module.isAMD;
-			});
-		}
-
 		compilation.mainTemplate.plugin("bootstrap", function(source, chunk) {
-			if (!compilation.dojoLoaderDependenciesAdded || !hasAMD(chunk)) {
-				return source;
-			}
 			const buf = [];
 			const jsonpFunction = this.outputOptions.jsonpFunction || Template.toIdentifier("webpackJsonp" + (this.outputOptions.library || ""));
 			buf.push(source);
@@ -193,17 +183,11 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			return this.asString(buf);
 		});
 
-		compilation.mainTemplate.plugin("module-obj", function(source, chunk) {
-			if (compilation.dojoLoaderDependenciesAdded && hasAMD(chunk)) {
-				source = source.replace("i: moduleId,", "i: req.absMidsById[moduleId] || moduleId,");
-			}
-			return source;
+		compilation.mainTemplate.plugin("module-obj", function(source) {
+			return source.replace("i: moduleId,", "i: req.absMidsById[moduleId] || moduleId,");
 		});
 
-		compilation.mainTemplate.plugin("require-extensions", function(source, chunk) {
-			if (!compilation.dojoLoaderDependenciesAdded || !hasAMD(chunk)) {
-				return source;
-			}
+		compilation.mainTemplate.plugin("require-extensions", function(source) {
 			const buf = [];
 			buf.push(source);
 			buf.push("");
@@ -238,12 +222,10 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		});
 
 		compilation.mainTemplate.plugin("hash", function(hash) {
-			if (compilation.dojoLoaderDependenciesAdded) {
-				hash.update("DojoAMDMainTemplate");
-				hash.update("3");		// Increment this whenever the template code above changes
-				if (!util.isString(options.loaderConfig)) {
-					hash.update(JSON.stringify(options.loaderConfig));
-				}
+			hash.update("DojoAMDMainTemplate");
+			hash.update("3");		// Increment this whenever the template code above changes
+			if (!util.isString(options.loaderConfig)) {
+				hash.update(JSON.stringify(options.loaderConfig));
 			}
 		});
 	}

lib/DojoLoaderEnsurePlugin.js

@@ -15,13 +15,6 @@
  */
  const util = require('util');
 
-function hasAMD(chunk) {
-	var modules = chunk.getModules ? chunk.getModules() : chunk.modules;
-	return modules.some((module) => {
-		return module.isAMD;
-	});
-}
-
 function containsModule(chunk, module) {
 	if (chunk.containsModule) {
 		return chunk.containsModule(module);
@@ -36,11 +29,8 @@ module.exports = class DojoLoaderEnsurePlugin {
 	}
 	apply(compilation) {
 		// Ensure that the Dojo loader, and optionally the loader config, are included
-		// in each entry chunk that has any AMD modules.
+		// in the entry chunks, and only the entry chunks.
 		compilation.plugin("after-optimize-chunks", (chunks) => {
-			if (!compilation.dojoLoaderDependenciesAdded) {
-				return;	// Nothing to do for this compilation
-			}
 			// Get the loader and loader config
 			const loaderModule = compilation.modules.find((module) => { return module.rawRequest === this.options.loader;});
 			if (!loaderModule) {
@@ -54,7 +44,7 @@ module.exports = class DojoLoaderEnsurePlugin {
 				}
 			}
 			chunks.forEach((chunk) => {
-				if (chunk.hasRuntime() && hasAMD(chunk)) {
+				if (chunk.hasRuntime()) {
 					if (!containsModule(chunk, loaderModule)) {
 						chunk.addModule(loaderModule);
 						loaderModule.addChunk(chunk);
@@ -63,6 +53,15 @@ module.exports = class DojoLoaderEnsurePlugin {
 						chunk.addModule(configModule);
 						configModule.addChunk(chunk);
 					}
+				} else {
+					if (containsModule(chunk, loaderModule)) {
+						chunk.removeModule(loaderModule);
+						loaderModule.removeChunk(chunk);
+					}
+					if (configModule && containsModule(chunk, configModule)) {
+						chunk.removeModule(configModule);
+						configModule.removeChunk(chunk);
+					}
 				}
 			});
 		});