Merge branch 'moo3-webpack/2892'

sokra · sokra · commit f1446232c661 · 2016-09-19T21:57:05.000+02:00
diff --git a/examples/dll-user/example.js b/examples/dll-user/example.js
@@ -3,5 +3,6 @@ console.log(require("../dll/a"));
 
 console.log(require("beta/beta"));
 console.log(require("beta/b"));
+console.log(require("beta/c"));
 
 console.log(require("module"));
diff --git a/examples/dll/c.jsx b/examples/dll/c.jsx
@@ -0,0 +1 @@
+module.exports = "jsx";
diff --git a/examples/dll/webpack.config.js b/examples/dll/webpack.config.js
@@ -1,9 +1,12 @@
 var path = require("path");
 var webpack = require("../../");
 module.exports = {
+	resolve: {
+		extensions: ['.js', '.jsx']
+	},
 	entry: {
 		alpha: ["./alpha", "./a", "module"],
-		beta: ["./beta", "./b"]
+		beta: ["./beta", "./b", "./c"]
 	},
 	output: {
 		path: path.join(__dirname, "js"),
diff --git a/lib/DllReferencePlugin.js b/lib/DllReferencePlugin.js
@@ -45,7 +45,8 @@ DllReferencePlugin.prototype.apply = function(compiler) {
 			type: this.options.type,
 			scope: this.options.scope,
 			context: this.options.context || compiler.options.context,
-			content: this.options.content || manifest.content
+			content: this.options.content || manifest.content,
+			extensions: this.options.extensions
 		}));
 	}.bind(this));
 };
diff --git a/test/configCases/dll-plugin/0-create-dll/f.jsx b/test/configCases/dll-plugin/0-create-dll/f.jsx
@@ -0,0 +1 @@
+module.exports = 'f';
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,10 @@ var path = require("path");
 var webpack = require("../../../../");
 
 module.exports = {
-	entry: ["./a", "./b", "./_d", "./_e"],
+	entry: ["./a", "./b", "./_d", "./_e", "./f"],
+	resolve: {
+		extensions: ['', '.js', '.jsx']
+	},
 	output: {
 		filename: "dll.js",
 		chunkFilename: "[id].dll.js",
diff --git a/test/configCases/dll-plugin/1-use-dll/index.js b/test/configCases/dll-plugin/1-use-dll/index.js
@@ -7,6 +7,10 @@ it("should load a module from dll", function() {
 	require("dll/a").should.be.eql("a");
 });
 
+it("should load a module of non-default type without extension from dll", function() {
+	require("dll/f").should.be.eql("f");
+});
+
 it("should load an async module from dll", function() {
 	require("dll/b")().then(function(c) {
 		c.should.be.eql({ default: "c" });
diff --git a/test/configCases/dll-plugin/1-use-dll/webpack.config.js b/test/configCases/dll-plugin/1-use-dll/webpack.config.js
@@ -7,7 +7,8 @@ module.exports = {
 			manifest: require("../../../js/config/dll-plugin/manifest0.json"),
 			name: "../0-create-dll/dll.js",
 			scope: "dll",
-			sourceType: "commonjs2"
+			sourceType: "commonjs2",
+			extensions: ['.js', '.jsx']
 		})
 	]
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ module.exports = {`
`7`	`7`	`manifest: require("../../../js/config/dll-plugin/manifest0.json"),`
`8`	`8`	`name: "../0-create-dll/dll.js",`
`9`	`9`	`scope: "dll",`
`10`		`- sourceType: "commonjs2"`
	`10`	`+ sourceType: "commonjs2",`
	`11`	`+ extensions: ['.js', '.jsx']`
`11`	`12`	`})`
`12`	`13`	`]`
`13`	`14`	`}`