allow exact match without extension in dll

sokra · sokra · commit 38264a092e13 · 2017-01-30T22:44:25.000+01:00
diff --git a/lib/DelegatedModuleFactoryPlugin.js b/lib/DelegatedModuleFactoryPlugin.js
@@ -25,10 +25,15 @@ DelegatedModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
 				var request = dependency.request;
 				if(request && request.indexOf(scope + "/") === 0) {
 					var innerRequest = "." + request.substr(scope.length);
+					var resolved;
+					if(innerRequest in this.options.content) {
+						resolved = this.options.content[innerRequest];
+						return callback(null, new DelegatedModule(this.options.source, resolved, this.options.type, innerRequest));
+					}
 					for(var i = 0; i < this.options.extensions.length; i++) {
 						var requestPlusExt = innerRequest + this.options.extensions[i];
 						if(requestPlusExt in this.options.content) {
-							var resolved = this.options.content[requestPlusExt];
+							resolved = this.options.content[requestPlusExt];
 							return callback(null, new DelegatedModule(this.options.source, resolved, this.options.type, requestPlusExt));
 						}
 					}
diff --git a/test/configCases/dll-plugin/0-create-dll/g-loader.js b/test/configCases/dll-plugin/0-create-dll/g-loader.js
@@ -0,0 +1,3 @@
+module.exports = function(source) {
+	return source;
+};
diff --git a/test/configCases/dll-plugin/0-create-dll/g.abc.js b/test/configCases/dll-plugin/0-create-dll/g.abc.js
@@ -0,0 +1 @@
+module.exports = typeof module.id;
diff --git a/test/configCases/dll-plugin/0-create-dll/webpack.config.js b/test/configCases/dll-plugin/0-create-dll/webpack.config.js
@@ -2,7 +2,7 @@ var path = require("path");
 var webpack = require("../../../../");
 
 module.exports = {
-	entry: ["./a", "./b", "./_d", "./_e", "./f"],
+	entry: ["./a", "./b", "./_d", "./_e", "./f", "./g.abc"],
 	resolve: {
 		extensions: [".js", ".jsx"]
 	},
@@ -11,6 +11,17 @@ module.exports = {
 		chunkFilename: "[id].dll.js",
 		libraryTarget: "commonjs2"
 	},
+	module: {
+		rules: [
+			{
+				test: /\.abc\.js$/,
+				loader: "./g-loader.js",
+				options: {
+					test: 1
+				}
+			}
+		]
+	},
 	plugins: [
 		new webpack.DllPlugin({
 			path: path.resolve(__dirname, "../../../js/config/dll-plugin/manifest0.json")
diff --git a/test/configCases/dll-plugin/1-use-dll/index.js b/test/configCases/dll-plugin/1-use-dll/index.js
@@ -28,3 +28,7 @@ it("should load an harmony module from dll (star export)", function() {
 	y1.should.be.eql(456);
 	y2.should.be.eql(456);
 });
+
+it("should load a module with loader applied", function() {
+	require("dll/g.abc.js").should.be.eql("number");
+});
diff --git a/test/configCases/dll-plugin/1-use-dll/webpack.config.js b/test/configCases/dll-plugin/1-use-dll/webpack.config.js
@@ -8,6 +8,7 @@ module.exports = {
 			scope: "dll",
 			sourceType: "commonjs2",
 			extensions: [".js", ".jsx"]
-		})
+		}),
+		new webpack.NamedModulesPlugin()
 	]
 };
diff --git a/test/configCases/dll-plugin/2-use-dll-without-scope/index.js b/test/configCases/dll-plugin/2-use-dll-without-scope/index.js
@@ -24,3 +24,7 @@ it("should load an harmony module from dll (star export)", function() {
 	y1.should.be.eql(456);
 	y2.should.be.eql(456);
 });
+
+it("should load a module with loader applied", function() {
+	require("../0-create-dll/g.abc.js").should.be.eql("number");
+})
diff --git a/test/configCases/dll-plugin/2-use-dll-without-scope/webpack.config.js b/test/configCases/dll-plugin/2-use-dll-without-scope/webpack.config.js
@@ -2,12 +2,26 @@ var path = require("path");
 var webpack = require("../../../../");
 
 module.exports = {
+	module: {
+		rules: [
+			{ oneOf: [
+				{
+					test: /\.abc\.js$/,
+					loader: "../0-create-dll/g-loader.js",
+					options: {
+						test: 1
+					}
+				}
+			] }
+		]
+	},
 	plugins: [
 		new webpack.DllReferencePlugin({
 			manifest: require("../../../js/config/dll-plugin/manifest0.json"),
 			name: "../0-create-dll/dll.js",
 			context: path.resolve(__dirname, "../0-create-dll"),
 			sourceType: "commonjs2"
-		})
+		}),
+		new webpack.NamedModulesPlugin()
 	]
 };

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function(source) {`
	`2`	`+ return source;`
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ module.exports = {`
`8`	`8`	`scope: "dll",`
`9`	`9`	`sourceType: "commonjs2",`
`10`	`10`	`extensions: [".js", ".jsx"]`
`11`		`- })`
	`11`	`+ }),`
	`12`	`+ new webpack.NamedModulesPlugin()`
`12`	`13`	`]`
`13`	`14`	`};`