Merge pull request #26 from chuckdumont/work2

Fix webpack 2 compatibility regressions

Author: Chuck Dumont

lib/DojoAMDMainTemplatePlugin.js

@@ -123,7 +123,8 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		}
 
 		function hasAMD(chunk) {
-			return chunk.getModules().some((module) => {
+			var modules = chunk.getModules ? chunk.getModules() : chunk.modules;
+			return modules.some((module) => {
 				return module.isAMD;
 			});
 		}

lib/DojoLoaderEnsurePlugin.js

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved.
+ * (C) Copyright IBM Corp. 2017 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.
@@ -16,11 +16,20 @@
  const util = require('util');
 
 function hasAMD(chunk) {
-	return chunk.getModules().some((module) => {
+	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);
+	} else {
+		return chunk.modules.indexOf(module) !== -1;
+	}
+}
+
 module.exports = class DojoLoaderEnsurePlugin {
 	constructor(options) {
 		this.options = options;
@@ -29,7 +38,6 @@ module.exports = class DojoLoaderEnsurePlugin {
 		// 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
 			}
@@ -47,11 +55,11 @@ module.exports = class DojoLoaderEnsurePlugin {
 			}
 			chunks.forEach((chunk) => {
 				if (chunk.hasRuntime() && hasAMD(chunk)) {
-					if (!chunk.containsModule(loaderModule)) {
+					if (!containsModule(chunk, loaderModule)) {
 						chunk.addModule(loaderModule);
 						loaderModule.addChunk(chunk);
 					}
-					if (configModule && !chunk.containsModule(configModule)) {
+					if (configModule && !containsModule(chunk, configModule)) {
 						chunk.addModule(configModule);
 						configModule.addChunk(chunk);
 					}