Merge pull request webpack#6213 from webpack/bugfix/override-post

sokra · web-flow · commit 7ed2bd2e9bb0 · 2017-12-30T20:51:40.000+01:00
`-!` keeps post loader instead of pre loader
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -143,7 +143,7 @@ class NormalModuleFactory extends Tapable {
 
 			const noAutoLoaders = /^-?!/.test(request);
 			const noPrePostAutoLoaders = /^!!/.test(request);
-			const noPostAutoLoaders = /^-!/.test(request);
+			const noPreAutoLoaders = /^-!/.test(request);
 			let elements = request.replace(/^-?!+/, "").replace(/!!+/g, "!").split("!");
 			let resource = elements.pop();
 			elements = elements.map(identToLoaderRequest);
@@ -220,9 +220,9 @@ class NormalModuleFactory extends Tapable {
 				const useLoadersPre = [];
 				result.forEach(r => {
 					if(r.type === "use") {
-						if(r.enforce === "post" && !noPostAutoLoaders && !noPrePostAutoLoaders)
+						if(r.enforce === "post" && !noPrePostAutoLoaders)
 							useLoadersPost.push(r.value);
-						else if(r.enforce === "pre" && !noPrePostAutoLoaders)
+						else if(r.enforce === "pre" && !noPreAutoLoaders && !noPrePostAutoLoaders)
 							useLoadersPre.push(r.value);
 						else if(!r.enforce && !noAutoLoaders && !noPrePostAutoLoaders)
 							useLoaders.push(r.value);
diff --git a/test/Compiler.test.js b/test/Compiler.test.js
@@ -8,6 +8,7 @@ const sinon = require("sinon");
 const webpack = require("../");
 const WebpackOptionsDefaulter = require("../lib/WebpackOptionsDefaulter");
 const Compiler = require("../lib/Compiler");
+const MemoryFs = require("memory-fs");
 
 describe("Compiler", () => {
 	function compile(entry, options, callback) {
@@ -242,6 +243,24 @@ describe("Compiler", () => {
 			});
 		});
 	});
+	it("should not emit on errors", function(done) {
+		const compiler = webpack({
+			context: __dirname,
+			mode: "production",
+			entry: "./missing",
+			output: {
+				path: "/",
+				filename: "bundle.js"
+			}
+		});
+		compiler.outputFileSystem = new MemoryFs();
+		compiler.run((err, stats) => {
+			if(err) return done(err);
+			if(compiler.outputFileSystem.existsSync("/bundle.js"))
+				return done(new Error("Bundle should not be created on error"));
+			done();
+		});
+	});
 	describe("Watching", () => {
 		let compiler;
 		beforeEach(() => {
diff --git a/test/Stats.test.js b/test/Stats.test.js
@@ -0,0 +1,48 @@
+/*globals describe it */
+"use strict";
+
+require("should");
+
+const webpack = require("../lib/webpack");
+const MemoryFs = require("memory-fs");
+
+describe("Stats", () => {
+	it("should print env string in stats", function(done) {
+		const compiler = webpack({
+			context: __dirname,
+			entry: "./fixtures/a"
+		});
+		compiler.outputFileSystem = new MemoryFs();
+		compiler.run((err, stats) => {
+			if(err) return done(err);
+			try {
+				stats.toString({
+					all: false,
+					env: true,
+					_env: "production"
+				}).should.be.eql(
+					"Environment (--env): \"production\""
+				);
+				stats.toString({
+					all: false,
+					env: true,
+					_env: {
+						prod: ["foo", "bar"],
+						baz: true
+					}
+				}).should.be.eql(
+					"Environment (--env): {\n" +
+					"  \"prod\": [\n" +
+					"    \"foo\",\n" +
+					"    \"bar\"\n" +
+					"  ],\n" +
+					"  \"baz\": true\n" +
+					"}"
+				);
+				done();
+			} catch(e) {
+				done(e);
+			}
+		});
+	});
+});
diff --git a/test/configCases/loaders/pre-post-loader/a.js b/test/configCases/loaders/pre-post-loader/a.js
@@ -0,0 +1 @@
+module.exports = "resource";
diff --git a/test/configCases/loaders/pre-post-loader/index.js b/test/configCases/loaders/pre-post-loader/index.js
@@ -0,0 +1,6 @@
+it("should apply pre and post loaders correctly", function() {
+	require("./a").should.be.eql("resource loader2 loader1 loader3");
+	require("!./a").should.be.eql("resource loader2 loader3");
+	require("!!./a").should.be.eql("resource");
+	require("-!./a").should.be.eql("resource loader3");
+});
diff --git a/test/configCases/loaders/pre-post-loader/loader1.js b/test/configCases/loaders/pre-post-loader/loader1.js
@@ -0,0 +1,3 @@
+module.exports = function(source) {
+	return source + "module.exports += \" loader1\";\n";
+};
diff --git a/test/configCases/loaders/pre-post-loader/loader2.js b/test/configCases/loaders/pre-post-loader/loader2.js
@@ -0,0 +1,3 @@
+module.exports = function(source) {
+	return source + "module.exports += \" loader2\";\n";
+};
diff --git a/test/configCases/loaders/pre-post-loader/loader3.js b/test/configCases/loaders/pre-post-loader/loader3.js
@@ -0,0 +1,3 @@
+module.exports = function(source) {
+	return source + "module.exports += \" loader3\";\n";
+};
diff --git a/test/configCases/loaders/pre-post-loader/webpack.config.js b/test/configCases/loaders/pre-post-loader/webpack.config.js
@@ -0,0 +1,20 @@
+module.exports = {
+	module: {
+		rules: [
+			{
+				test: /a\.js$/,
+				use: "./loader1",
+			},
+			{
+				test: /a\.js$/,
+				use: "./loader2",
+				enforce: "pre"
+			},
+			{
+				test: /a\.js$/,
+				use: "./loader3",
+				enforce: "post"
+			}
+		]
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function(source) {`
	`2`	`+ return source + "module.exports += \" loader1\";\n";`
	`3`	`+};`