Add support for cjsRequire function for loading CommonJS modules from AMD modules

Author: chuckd

NOTICE

@@ -11,6 +11,7 @@ https://github.com/webpack/webpack/blob/v1.14.0/lib/dependencies/AMDDefineDepend
 https://github.com/webpack/webpack/blob/v1.14.0/lib/dependencies/ModuleDependencyTemplateAsRequireId.js
 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
 
 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 

README.md

@@ -9,7 +9,9 @@
 
 # The Dojo loader
 
-**dojo-webpack-plugin** uses the Dojo loader (dojo.js) at build time to resolve modules based on the properties specified in the Dojo loader config.  In addition, a stripped-down build of the loader, as well as the loader config, are embedded in the packed application to support client-side execution of `require()` calls that have not been transformed by Webpack at build time (i.e. `require()` calls that reference non-stactic variables).  Synchronous `require()` (e.g. `require('foo')`), which returns a reference to an already loaded module or else throws an exception, is supported, as are the `require.toAbsMid()` and `require.toUrl()` functions.
+**dojo-webpack-plugin** uses the Dojo loader (dojo.js) at build time to resolve modules based on the properties specified in the Dojo loader config.  In addition, a stripped-down build of the loader, as well as the loader config, are embedded in the packed application to support client-side execution of `require()` calls that have not been transformed by Webpack at build time (i.e. `require()` calls that reference non-stactic variables), as well as Dojo's `require.toAbsMid()` and `require.toUrl()` functions.
+
+Dojo supports a form of `require` (known as synchronous `require`) that has the same signature as CommonJS `require`.  In Dojo, synchronous `require` returns a reference to an already loaded module, or else throws an exception if the module has not already been loaded and initialized.  With this plugin, `require` calls matching the CommonJS/synchronous `require` signature which appear inside of AMD modules are treated as Dojo synchronous `require` calls.  If you wish to load a CommonJS module from within an AMD module, you may do so using the `cjsRequire` function that is supported by the plugin.
 
 This package does not include the Dojo loader.  A custom build of the Dojo loader is built by Webpack based on the location of Dojo specified in the Dojo loader config.  Alternatively, the location of a previously built loader may be specified using the [loader](#loader) option.  See [Building the Dojo loader](#building-the-dojo-loader).  
 

lib/CJSRequireDependencyParserPlugin.js

@@ -0,0 +1,50 @@
+/*
+ * (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.
+ */
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const RequireHeaderDependency = require("webpack/lib/dependencies/RequireHeaderDependency");
+const LocalModuleDependency = require("webpack/lib/dependencies/LocalModuleDependency");
+const LocalModulesHelpers = require("webpack/lib/dependencies/LocalModulesHelpers");
+
+module.exports = class CJSRequireDependencyParserPlugin {
+	apply(parser) {
+		parser.plugin("call cjsRequire", (expr) => {
+			if(expr.arguments.length !== 1) return;
+			let localModule;
+			const param = parser.evaluateExpression(expr.arguments[0]);
+			if(param.isString() && (localModule = LocalModulesHelpers.getLocalModule(parser.state, param.string))) {
+				const dep = new LocalModuleDependency(localModule, expr.range);
+				dep.loc = expr.loc;
+				parser.state.current.addDependency(dep);
+				return true;
+			} else {
+				const result = parser.applyPluginsBailResult("call require:commonjs:item", expr, param);
+				if(result === undefined) {
+					parser.applyPluginsBailResult("call require:commonjs:context", expr, param);
+				} else {
+					const dep = new RequireHeaderDependency(expr.callee.range);
+					dep.loc = expr.loc;
+					parser.state.current.addDependency(dep);
+				}
+				return true;
+			}
+		});
+	}
+};

lib/DojoAMDPlugin.js

@@ -24,6 +24,7 @@ const NullFactory = require("webpack/lib/NullFactory");
 
 const DojoAMDRequireDependenciesBlockParserPlugin = require("./DojoAMDRequireDependenciesBlockParserPlugin");
 const DojoAMDDefineDependencyParserPlugin = require("./DojoAMDDefineDependencyParserPlugin");
+const CJSRequireDependencyParserPlugin = require("./CJSRequireDependencyParserPlugin");
 const DojoAMDMainTemplatePlugin = require("./DojoAMDMainTemplatePlugin");
 const DojoAMDChunkTemplatePlugin = require("./DojoAMDChunkTemplatePlugin");
 const DojoAMDResolverPlugin = require("./DojoAMDResolverPlugin");
@@ -131,7 +132,8 @@ module.exports = class DojoAMDPlugin {
 			params.normalModuleFactory.plugin("parser", (parser) => {
 				parser.apply(
 					new DojoAMDRequireDependenciesBlockParserPlugin(this.options, reqWrapper),
-					new DojoAMDDefineDependencyParserPlugin(this.options, reqWrapper)
+					new DojoAMDDefineDependencyParserPlugin(this.options, reqWrapper),
+					new CJSRequireDependencyParserPlugin()
 				);
 			});
 			compiler.resolvers.normal.apply(