Merge pull request webpack#3303 from webpack/bugfix/cli

sokra · web-flow · commit fe6790121a3a · 2016-11-17T08:35:17.000+01:00
`--module-bind` automatically appends `-loader`
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -296,6 +296,7 @@ module.exports = function(yargs, argv, convertOptions) {
 			ifArgPair(arg, function(name, binding) {
 				if(name === null) {
 					name = binding;
+					binding += "-loader";
 				}
 				options.module[collection].push({
 					test: new RegExp("\\." + name.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + "$"),
diff --git a/test/browsertest/build.js b/test/browsertest/build.js
@@ -34,10 +34,10 @@ var library1 = cp.spawn("node", join(["../../bin/webpack.js", "--output-pathinfo
 bindOutput(library1);
 library1.on("exit", function(code) {
 	if(code === 0) {
-		// node ../../bin/webpack --output-pathinfo --color --resolve-alias vm=vm-browserify --output-public-path js/ --output-chunk-filename [name].web.js --module-bind json --module-bind css=style!css --module-bind less=style!css!less --module-bind coffee --module-bind jade --prefetch ./lib/stylesheet.less ./lib/index "js/web.js?h=[hash]"
+		// node ../../bin/webpack --output-pathinfo --color --resolve-alias vm=vm-browserify --output-public-path js/ --output-chunk-filename [name].web.js --module-bind json --module-bind css=style!css --module-bind less=style-loader!css-loader!less-loader --module-bind coffee --module-bind jade --prefetch ./lib/stylesheet.less ./lib/index "js/web.js?h=[hash]"
 		var main = cp.spawn("node", join(["../../bin/webpack.js", "--output-pathinfo", "--color", "--resolve-alias", "vm=vm-browserify",
 											"--output-public-path", "js/", "--output-chunk-filename", "[name].web.js",
-											"--module-bind", "json", "--module-bind", "css=style!css", "--module-bind", "less=style/url!file?postfix=.css&string!less", "--module-bind", "coffee", "--module-bind", "jade", "--prefetch", "./lib/stylesheet.less", "./lib/index", "js/web.js?h=[hash]", "--progress"], extraArgs));
+											"--module-bind", "json", "--module-bind", "css=style-loader!css-loader", "--module-bind", "less=style-loader/url!file-loader?postfix=.css&string!less-loader", "--module-bind", "coffee", "--module-bind", "jade", "--prefetch", "./lib/stylesheet.less", "./lib/index", "js/web.js?h=[hash]", "--progress"], extraArgs));
 		bindOutput(main);
 	}
 });
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -9,7 +9,7 @@ function test(cond, message) {
 }
 
 // load tests from library1, with script loader
-require("script!../js/library1.js");
+require("script-loader!../js/library1.js");
 
 // Buildin 'style' loader adds css to document
 require("./stylesheet.css");
@@ -32,7 +32,7 @@ describe("main", function() {
 		should.exist(window.library2.ok);
 		window.library2.ok.should.be.eql(true);
 	});
-	
+
 	describe("web resolving", function() {
 		it("should load index.web.js instead of index.js", function() {
 			true.should.be.eql(true);
@@ -87,8 +87,8 @@ describe("main", function() {
 
 	describe("web loaders", function() {
 		it("should handle the file loader correctly", function() {
-			require("!file!../img/image.png").should.match(/js\/.+\.png$/);
-			document.getElementById("image").src = require("file?prefix=img/!../img/image.png");
+			require("!file-loader!../img/image.png").should.match(/js\/.+\.png$/);
+			document.getElementById("image").src = require("file-loader?prefix=img/!../img/image.png");
 		});
 	});
 
diff --git a/test/browsertest/library2config.coffee b/test/browsertest/library2config.coffee
@@ -8,7 +8,7 @@ exports.default = new Promise (resolve, reject) ->
 				hashDigestLength: 5
 			module:
 				rules: [
-					{ test: /extra2?\.js/, loader: "raw!./node_modules/extra.loader.js!val?cacheable", enforce: "post" }
+					{ test: /extra2?\.js/, loader: "raw-loader!./node_modules/extra.loader.js!val-loader?cacheable", enforce: "post" }
 				]
 			amd:
 				fromOptions: true

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,7 @@ module.exports = function(yargs, argv, convertOptions) {`
`296`	`296`	`ifArgPair(arg, function(name, binding) {`
`297`	`297`	`if(name === null) {`
`298`	`298`	`name = binding;`
	`299`	`+ binding += "-loader";`
`299`	`300`	`}`
`300`	`301`	`options.module[collection].push({`
`301`	`302`	`test: new RegExp("\\." + name.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\\|]/g, "\\$&") + "$"),`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ exports.default = new Promise (resolve, reject) ->`
`8`	`8`	`hashDigestLength: 5`
`9`	`9`	`module:`
`10`	`10`	`rules: [`
`11`		`- { test: /extra2?\.js/, loader: "raw!./node_modules/extra.loader.js!val?cacheable", enforce: "post" }`
	`11`	`+ { test: /extra2?\.js/, loader: "raw-loader!./node_modules/extra.loader.js!val-loader?cacheable", enforce: "post" }`
`12`	`12`	`]`
`13`	`13`	`amd:`
`14`	`14`	`fromOptions: true`