Merge pull request #25 from chuckdumont/revs/heads/work2

Ensure Dojo loader module isn't removed from entry chunks by chunk optimizers

Author: Chuck Dumont

lib/DojoAMDMainTemplatePlugin.js

@@ -122,8 +122,14 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			}
 		}
 
+		function hasAMD(chunk) {
+			return chunk.getModules().some((module) => {
+				return module.isAMD;
+			});
+		}
+
 		compilation.mainTemplate.plugin("bootstrap", function(source, chunk) {
-			if (!compilation.dojoLoaderDependenciesAdded) {
+			if (!compilation.dojoLoaderDependenciesAdded || !hasAMD(chunk)) {
 				return source;
 			}
 			const buf = [];
@@ -186,15 +192,15 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			return this.asString(buf);
 		});
 
-		compilation.mainTemplate.plugin("module-obj", function(source) {
-			if (compilation.dojoLoaderDependenciesAdded) {
+		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("require-extensions", function(source) {
-			if (!compilation.dojoLoaderDependenciesAdded) {
+		compilation.mainTemplate.plugin("require-extensions", function(source, chunk) {
+			if (!compilation.dojoLoaderDependenciesAdded || !hasAMD(chunk)) {
 				return source;
 			}
 			const buf = [];
@@ -208,14 +214,13 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			buf.push("\tg: (function(){return this;})()   // Easy access to global scope");
 			buf.push("};");
 			buf.push("var loaderScope = {document:document};");
-			const modules = compilation.getModules ? compilation.getModules() : compilation.modules;
-			const dojoLoaderModule = modules.find((module) => { return module.rawRequest === options.loader;});
+			const dojoLoaderModule = compilation.modules.find((module) => { return module.rawRequest === options.loader;});
 			if (!dojoLoaderModule) {
 				throw Error("Can't locate " + options.loader + " in compilation");
 			}
 			var s = "var loaderConfig = ";
 			if (util.isString(options.loaderConfig)) {
-				const dojoLoaderConfig = modules.find((module) => { return module.rawRequest === options.loaderConfig;});
+				const dojoLoaderConfig = compilation.modules.find((module) => { return module.rawRequest === options.loaderConfig;});
 				s += this.requireFn + "(" + JSON.stringify(dojoLoaderConfig.id) + ");";
 			} else {
 				s += JSON.stringify(options.loaderConfig);

lib/DojoAMDPlugin.js

@@ -28,6 +28,7 @@ const DojoAMDMainTemplatePlugin = require("./DojoAMDMainTemplatePlugin");
 const DojoAMDChunkTemplatePlugin = require("./DojoAMDChunkTemplatePlugin");
 const DojoAMDResolverPlugin = require("./DojoAMDResolverPlugin");
 const DojoAMDModuleFactoryPlugin = require("./DojoAMDModuleFactoryPlugin");
+const DojoLoaderEnsurePlugin = require("./DojoLoaderEnsurePlugin");
 
 module.exports = class DojoAMDPlugin {
 	constructor(options) {
@@ -87,6 +88,7 @@ module.exports = class DojoAMDPlugin {
 
 			compilation.apply(new DojoAMDMainTemplatePlugin(this.options));
 			compilation.apply(new DojoAMDChunkTemplatePlugin(this.options));
+			compilation.apply(new DojoLoaderEnsurePlugin(this.options));
 
 			params.normalModuleFactory.plugin("parser", (parser) => {
 				parser.plugin("expression module", () => {

lib/DojoLoaderEnsurePlugin.js

@@ -0,0 +1,62 @@
+/*
+ * (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ const util = require('util');
+
+function hasAMD(chunk) {
+	return chunk.getModules().some((module) => {
+		return module.isAMD;
+	});
+}
+
+module.exports = class DojoLoaderEnsurePlugin {
+	constructor(options) {
+		this.options = options;
+	}
+	apply(compilation) {
+		// Ensure that the Dojo loader, and optionally the loader config, are included
+		// in each entry chunk that has any AMD modules.
+		compilation.plugin("after-optimize-chunks", (chunks) => {
+			debugger;
+			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) {
+				throw Error("Can't locate " + this.options.loader + " in compilation");
+			}
+			let configModule;
+			if (util.isString(this.options.loaderConfig)) {
+				configModule = compilation.modules.find((module) => { return module.rawRequest === this.options.loaderConfig;});
+				if (!configModule) {
+					throw Error("Can't locate " + this.options.loaderConfig + " in compilation");
+				}
+			}
+			chunks.forEach((chunk) => {
+				if (chunk.hasRuntime() && hasAMD(chunk)) {
+					if (!chunk.containsModule(loaderModule)) {
+						chunk.addModule(loaderModule);
+						loaderModule.addChunk(chunk);
+					}
+					if (configModule && !chunk.containsModule(configModule)) {
+						chunk.addModule(configModule);
+						configModule.addChunk(chunk);
+					}
+				}
+			});
+		});
+	}
+};