Merge branch 'master' of https://github.com/OpenNTF/dojo-webpack-plugin

.eslintignore

@@ -1,2 +1,3 @@
 node/**
 node_modules/**
+test/js/**

.gitignore

@@ -1 +1,2 @@
 /node_modules/
+/test/js/

NOTICE

@@ -12,6 +12,9 @@ https://github.com/webpack/webpack/blob/v1.14.0/lib/dependencies/ModuleDependenc
 https://github.com/webpack/webpack/blob/v1.14.0/lib/dependencies/AMDRequireArrayDependency.js
 https://github.com/webpack/webpack/blob/v1.14.0/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js
 https://github.com/webpack/webpack/blob/v1.14.0/lib/dependencies/CommonJsRequireDependencyParserPlugin.js
+https://github.com/webpack/webpack/blob/v3.6.0/test/ConfigTestCases.test.js	(test only)
+https://github.com/webpack/webpack/blob/v3.6.0/test/checkArrayExpectation.js (test only)
+https://github.com/webpack/webpack/blob/v3.6.0/lib/node/NodeMainTemplatePlugin.js (test only)
 
 The product includes third party code that has been modified and adapted from the following file, originating in the Dojo Util project, and licensed under the Dojo License - http://dojotoolkit.org/license:
 https://github.com/dojo/util/blob/1.10/build/transforms/writeDojo.js 

lib/DojoAMDMainTemplatePlugin.js

@@ -23,6 +23,7 @@
  */
 
 const util = require('util');
+const ConcatSource = require("webpack-sources").ConcatSource;
 
 module.exports = class DojoAMDMainTemplatePlugin {
 	constructor(options) {
@@ -102,8 +103,11 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		}
 
 		function dojoModuleFromWebpackModule(webpackModule) {
-			var dojoModule = Object.create(webpackModule);
-			dojoModule.id = req.absMidsById[webpackModule.id];
+			var dojoModule = {};
+			Object.keys(webpackModule).forEach(key => {
+				dojoModule[key] = webpackModule[key];
+			});
+			dojoModule.i = req.absMidsById[webpackModule.i] || webpackModule.i;
 			return dojoModule;
 		}
 
@@ -125,6 +129,31 @@ module.exports = class DojoAMDMainTemplatePlugin {
 				throw new Error('Unsupported require call');
 			}
 		}
+
+		// For unit testing only
+		compilation.mainTemplate.plugin("require", function(source) {
+			if (compilation.options.target === "async-node") {
+				// When running unit tests in node, the scoped require function is node's CommonJs
+				// require.  This code, together with the 'render' plugin below, defines a scoped
+				// Dojo require variable for each AMD module so that referencing 'require' from
+				// within the module will yield the Dojo function.
+				source = source.replace(/__webpack_require__\);/g, "__webpack_require__, req);");
+			}
+			return source;
+		});
+
+		// For unit testing only
+		compilation.moduleTemplate.plugin("render", function(source, module) {
+			var result = source;
+			if (module.isAMD && compilation.options.target === "async-node") {
+				// Define a module scoped 'require' variable for AMD modules that yields the
+				// the Dojo require function.
+				result = new ConcatSource();
+				result.add("var require = arguments[3];");
+				result.add(source);
+			}
+			return result;
+		});
 
 		compilation.mainTemplate.plugin("bootstrap", function(source, chunk) {
 			const buf = [];
@@ -179,16 +208,17 @@ module.exports = class DojoAMDMainTemplatePlugin {
 			buf.push("(function(){ // Ensure this refers to global scope");
 			buf.push(this.indent("this.require = req;"));
 			if(chunk.chunks.length > 0) {
-				buf.push(this.indent("this[" + JSON.stringify(this.outputOptions.jsonpFunction) + "].registerAbsMids = registerAbsMids;"));
+				var jsonpFn = JSON.stringify(this.outputOptions.jsonpFunction);
+				if (compilation.options.target === "async-node") {
+					// For unit tests, the jsonp function is not defined by default
+					buf.push(this.indent(`this[${jsonpFn}] = this[${jsonpFn}] || {}`));
+				}
+				buf.push(this.indent(`this[${jsonpFn}].registerAbsMids = registerAbsMids;`));
 			}
 			buf.push("})();");
 			return this.asString(buf);
 		});
 
-		compilation.mainTemplate.plugin("module-obj", function(source) {
-			return source.replace("i: moduleId,", "i: req.absMidsById[moduleId] || moduleId,");
-		});
-
 		compilation.mainTemplate.plugin("require-extensions", function(source) {
 			const buf = [];
 			buf.push(source);