Merge pull request #58 from chuckdumont/work2

Add support for dojo/query selector engines specified using loader plugin syntax

Author: Chuck Dumont

README.md

@@ -104,6 +104,10 @@ new webpack.NormalModuleReplacementPlugin(/^dojo\/selector\/_loader!/, "dojo/sel
 new webpack.NormalModuleReplacementPlugin(/^dojo\/request\/default!/, "dojo/request/xhr"),
 new webpack.NormalModuleReplacementPlugin(/^dojo\/text!/, function(data) {
 	data.request = data.request.replace(/^dojo\/text!/, "!!raw!");
+}),
+new NormalModuleReplacementPlugin(/^dojo\/query!/, data => {
+	var match = /^dojo\/query!(.*)$/.exec(data.request);
+	data.request = "dojo/loaderProxy?loader=dojo/query&name=" + match[1] + "!";
 })
 ```
 
@@ -157,10 +161,12 @@ new webpack.NormalModuleReplacementPlugin(
 )
 ```
 
-The general syntax for the `dojo/loaderProxy` loader extension is `dojo/loaderProxy?loader=<loader>&deps=<dependencies>!<resource>` where *loader* specifies the Dojo loader extension to run on the client and *dependencies* specifies a comma separated list of module dependencies to add to the packed resources.  In the example above, if the client code specifies the module as `svg!closeBtn.svg`, then the translated module will be `dojo/loaderProxy?loader=svg&deps=dojo/text%21closeBtn.svg!closeBtn.svg`.  Note the need to URL encode the `!` character so as not to trip up parsing.
+The general syntax for the `dojo/loaderProxy` loader extension is `dojo/loaderProxy?loader=<loader>&deps=<dependencies>&name=<resource>!<resource>` where *loader* specifies the Dojo loader extension to run on the client and *dependencies* specifies a comma separated list of module dependencies to add to the packed resources.  In the example above, if the client code specifies the module as `svg!closeBtn.svg`, then the translated module will be `dojo/loaderProxy?loader=svg&deps=dojo/text%21closeBtn.svg!closeBtn.svg`.  Note the need to URL encode the `!` character so as not to trip up parsing.
 
 Specifying `dojo/text!closeBtn.svg` as a dependency ensures that when it is required by the `svg` loader extension's load method on the client, then the dependency will be resolved in-line and the `load` method's callback will be invoked in-line as required.
 
+The *name* query arg is optional and is provided for cases where the resource name (the text to the right of the "!") does not represent a module.  Since webpack requires the resource name to represent a valid module, you can use the *name* query arg to specify non-module resources.  For example, the loaderProxy URL for `dojo/query!css2` would be `dojo/loaderProxy?loader=dojo/query&name=css2!`. 
+
 # Options
 
 The plugin is instantiated with a properties map specifying the following options:

lib/DojoAMDPlugin.js

@@ -133,16 +133,20 @@ Refer to https://github.com/OpenNTF/dojo-webpack-plugin/blob/master/README.md#bu
 
 		compiler.plugin("normal-module-factory", () => {
 			compiler.apply(
-				new NormalModuleReplacementPlugin(/^dojo\/selector\/_loader!/, (data) => {
+				new NormalModuleReplacementPlugin(/^dojo\/selector\/_loader!/, data => {
 					data.absMidAliases.push(data.absMid);
 					data.absMid = data.request = "dojo/selector/lite";
 				}),
-				new NormalModuleReplacementPlugin(/^dojo\/request\/default!/, (data) => {
+				new NormalModuleReplacementPlugin(/^dojo\/request\/default!/, data => {
 					data.absMidAliases.push(data.absMid);
 					data.absMid = data.request = "dojo/request/xhr";
 				}),
-				new NormalModuleReplacementPlugin(/^dojo\/text!/, (data) => {
+				new NormalModuleReplacementPlugin(/^dojo\/text!/, data => {
 					data.request = data.request.replace(/^dojo\/text!/, "!!raw-loader!");
+				}),
+				new NormalModuleReplacementPlugin(/^dojo\/query!/, data => {
+					var match = /^dojo\/query!(.*)$/.exec(data.request);
+					data.request = "dojo/loaderProxy?loader=dojo/query&name=" + match[1] + "!";
 				})
 			);
 		});

loaders/dojo/loaderProxy/index.js

@@ -23,7 +23,7 @@ module.exports = function() {
 	if (!loader) {
 		throw new Error("No loader specified");
 	}
-	const name = this._module.absMid.split("!").pop();
+	const name = query.name || this._module.absMid.split("!").pop();
 	const deps = query.deps ? query.deps.split(",") : [];
 	var issuerAbsMid, issuer = this._module.issuer;
 	if (issuer) {

test/TestCases/loaders/selectorEngine/index.js

@@ -0,0 +1,5 @@
+define(["dojo/query!css2"], function(engine) {
+	it("should load text files" , function() {
+		"css2".should.be.eql(engine);
+	});
+});

test/TestCases/loaders/selectorEngine/query.js

@@ -0,0 +1,7 @@
+define([], function() {
+	return {
+		load: function(name, req__, callback) {
+			callback(name);
+		}
+	};
+});

test/TestCases/loaders/selectorEngine/webpack.config.js

@@ -0,0 +1,17 @@
+var path = require("path");
+var DojoWebpackPlugin = require("../../../../index");
+module.exports = {
+	entry: "test/index",
+	plugins: [
+		new DojoWebpackPlugin({
+			loaderConfig: {
+				paths:{test: "."}
+			},
+			loader: path.join(__dirname, "../../../js/dojo/dojo.js")
+		})
+	],
+	resolve: {
+		alias: {
+			'dojo/query': path.join(__dirname, "./query.js")
+		}
+	}};