Merge pull request #122 from chuckdumont/work

Run dojo resolver before default resolvers

lib/DojoAMDPlugin.js

@@ -36,13 +36,13 @@ module.exports = class DojoAMDPlugin {
 	}
 
 	apply(compiler) {
-
+		compiler.options.resolve.plugins = compiler.options.resolve.plugins || [];
+		compiler.options.resolve.plugins.push(this.newResolverPlugin(this.options, compiler));
 		compiler.apply(
 			this.newDojoLoaderPlugin(this.options),
 			this.newMainTemplatePlugin(this.options),
 			this.newChunkTemplatePlugin(this.options),
-			this.newModuleFactoryPlugin(this.options),
-			this.newResolverPlugin(this.options)
+			this.newModuleFactoryPlugin(this.options)
 		);
 
 		compiler.plugin("compilation", this.compilationPlugins.bind(this));
@@ -118,8 +118,8 @@ module.exports = class DojoAMDPlugin {
 	newModuleFactoryPlugin(options) {
 		return new DojoAMDModuleFactoryPlugin(options);
 	}
-	newResolverPlugin() {
-		return new DojoAMDResolverPlugin();
+	newResolverPlugin(options, compiler) {
+		return new DojoAMDResolverPlugin(options, compiler);
 	}
 	newRequireDependenciesBlockParserPlugin(options, parser) {
 		return new DojoAMDRequireDependenciesBlockParserPlugin(options, parser);

lib/DojoAMDResolverPlugin.js

@@ -16,12 +16,15 @@
 const path = require("path");
 
 module.exports = class DojoAMDResolverPlugin {
-	apply(compiler) {
+	constructor(options, compiler) {
+		this.options = options;
 		this.compiler = compiler;
-		compiler.plugin("normal-module-factory", () => {
-			compiler.resolvers.normal.plugin('module', this.module.bind(this));
-		});
 	}
+
+	apply(resolver) {
+		resolver.plugin("module", this.module.bind(this));
+	}
+
 	module(request, callback) {
 		if (request.directory) {
 			return callback();
@@ -36,7 +39,7 @@ module.exports = class DojoAMDResolverPlugin {
 			};
 			const message = `Dojo resolve ${obj.path} from ${request.request} in ${request.path}`;
 			this.compiler.resolvers.normal.doResolve(['raw-file'], obj, message, (err, result) => {
-				callback(null, result);
+				return result ? callback(null, result) : callback();
 			});
 		} else {
 			callback();

test/DojoAMDResolverPlugin.test.js

@@ -9,31 +9,23 @@
 const DojoAMDResolverPlugin = require("../lib/DojoAMDResolverPlugin");
 
 describe("DojoAMDResolverPlugin tests", function() {
-	const plugin = new DojoAMDResolverPlugin({});
+	const plugin = new DojoAMDResolverPlugin({}, {
+		applyPluginsBailResult(event) {
+			if (event === "get dojo require") {
+				return {
+					toUrl: (request) => {
+						return request.request === "null" ? null : request.request;
+					}
+				};
+			}
+		}
+	});
 	var moduleCallback;
 	beforeEach(function() {
 		plugin.apply({
-			resolvers: {
-				normal: {
-					plugin: (event, callback) => {
-						if (event === "module") {
-							moduleCallback = callback;
-						}
-					}
-				}
-			},
 			plugin: (event, callback) => {
-				if (event === "normal-module-factory") {
-					callback();
-				}
-			},
-			applyPluginsBailResult(event) {
-				if (event === "get dojo require") {
-					return {
-						toUrl: (request) => {
-							return request.request === "null" ? null : request.request;
-						}
-					};
+				if (event === "module") {
+					moduleCallback = callback;
 				}
 			}
 		});