Merge pull request #100 from chuckdumont/work

Fix issue with bad parser context when handling 'call define' expression

Author: Chuck Dumont

lib/DojoAMDDefineDependencyParserPlugin.js

@@ -33,23 +33,39 @@ module.exports = class DojoAMDDefineDependencyParserPlugin extends AMDDefineDepe
 	}
 
 	apply(parser) {
-		super.apply(Object.assign(Object.create(parser), {
-			plugin: (expression, callback) => {
-				if (expression === "call define") {
-					// Augment base class implementation for "call define"
-					parser.plugin(expression, this.callDefine.bind(this, callback, parser));
-				}
-			}
-		}));
+		this.subclassCallDefineHandler(parser);
 
 		parser.plugin("call define:amd:array", this.callDefineAmdArray.bind(this, parser));
 
 		parser.plugin("call define:amd:item", this.callDefineAmdItem.bind(this, parser));
 	}
 
+	subclassCallDefineHandler(parser) {
+		// "Subclasses" the 'call define' handler in the base class implementation.  This is a bit
+		// painful because the base class is not set up to support subclassing, but we manage by
+		// replacing the parser plugin handler for the duration of the apply call in the super
+		// class and then grabbing the 'call define' callback so that we can use it for our own
+		// 'call define' handler.
+		var original_plugin;
+		if (parser.hasOwnProperty("plugin")) {
+			original_plugin = parser.plugin;
+		}
+		parser.plugin = (expression, callback) => {
+			if (expression === "call define") {
+				// Augment base class implementation for "call define"
+				(original_plugin || parser.__proto__.plugin).call(parser, expression, this.callDefine.bind(this, callback, parser));
+			}
+		};
+		super.apply(parser);
+		delete parser.plugin;
+		if (original_plugin) {
+			parser.plugin = original_plugin;
+		}
+	}
+
 	callDefine(cb, parser, expr) {
 		parser.state.current.isAMD = true;
-		const result = cb.call(parser, expr);	// invoke base class implementation
+		const result = cb.call(this, expr);	// invoke base class implementation
 		/* istanbul ignore if  */
 		if (!AMDDefineDependencyParserPlugin.prototype.newDefineDependency) {
 			// This is pretty hacky.  Earlier versions of webpack don't provide the newDefineDependency method allowing us