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

Build error when using ExtractTextPlugin

Author: Chuck Dumont

lib/DojoAMDDefineDependencyParserPlugin.js

@@ -38,12 +38,12 @@ module.exports = class DojoAMDDefineDependencyParserPlugin {
 			if (expr.dojoSkipFlag) return;
 			expr.dojoSkipFlag = true;
 
-			if (!parser.dojoLoaderDependenciesAdded) {
+			if (!parser.state.compilation.dojoLoaderDependenciesAdded) {
 				parser.state.current.addDependency(new CommonJsRequireDependency(this.options.loader));
 				if (util.isString(this.options.loaderConfig)) {
 					parser.state.current.addDependency(new CommonJsRequireDependency(this.options.loaderConfig));
 				}
-				parser.dojoLoaderDependenciesAdded = true;
+				parser.state.compilation.dojoLoaderDependenciesAdded = true;
 			}
 			parser.state.current.isAMD = true;
 			const result = parser.applyPluginsBailResult("call define", expr);

lib/DojoAMDMainTemplatePlugin.js

@@ -123,6 +123,9 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		}
 
 		compilation.mainTemplate.plugin("bootstrap", function(source, chunk) {
+			if (!compilation.dojoLoaderDependenciesAdded) {
+				return source;
+			}
 			const buf = [];
 			const jsonpFunction = this.outputOptions.jsonpFunction || Template.toIdentifier("webpackJsonp" + (this.outputOptions.library || ""));
 			buf.push(source);
@@ -183,14 +186,17 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			return this.asString(buf);
 		});
 
-		compilation.mainTemplate.plugin("module-obj", function() {
-			return this.asString([
-				"i: req.absMidsById[moduleId] || moduleId,",
-				"exports: {}"
-			]);
+		compilation.mainTemplate.plugin("module-obj", function(source) {
+			if (compilation.dojoLoaderDependenciesAdded) {
+				source = source.replace("i: moduleId,", "i: req.absMidsById[moduleId] || moduleId,");
+			}
+			return source;
 		});
 
 		compilation.mainTemplate.plugin("require-extensions", function(source) {
+			if (!compilation.dojoLoaderDependenciesAdded) {
+				return source;
+			}
 			const buf = [];
 			buf.push(source);
 			buf.push("");
@@ -202,13 +208,14 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			buf.push("\tg: (function(){return this;})()   // Easy access to global scope");
 			buf.push("};");
 			buf.push("var loaderScope = {document:document};");
-			const dojoLoaderModule = compilation.findModule(require.resolve(options.loader));
+			const modules = compilation.getModules ? compilation.getModules() : compilation.modules;
+			const dojoLoaderModule = 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 = compilation.findModule(require.resolve(options.loaderConfig));
+				const dojoLoaderConfig = modules.find((module) => { return module.rawRequest === options.loaderConfig;});
 				s += this.requireFn + "(" + JSON.stringify(dojoLoaderConfig.id) + ");";
 			} else {
 				s += JSON.stringify(options.loaderConfig);
@@ -225,10 +232,12 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		});
 
 		compilation.mainTemplate.plugin("hash", function(hash) {
-			hash.update("DojoAMDMainTemplate");
-			hash.update("2");		// Increment this whenever the template code above changes
-			if (!util.isString(options.loaderConfig)) {
-				hash.update(JSON.stringify(options.loaderConfig));
+			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));
+				}
 			}
 		});
 	}