root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(from xxx) => (@ xxx); fix test

This commit is contained in:
mc-zone 2018-02-22 08:10:56 +08:00
parent b09a76234c
commit 16c1f9e42c
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ModuleBuildError.js
View File

@ -14,7 +14,7 @@ class ModuleBuildError extends WebpackError {
this.name = "ModuleBuildError";
this.message = "Module build failed";
if(from) {
this.message += ` (from ${from})`;
this.message += ` (@ ${from})`;
}
this.message += ": ";
if(err !== null && typeof err === "object") {

2
lib/ModuleError.js
View File

@ -15,7 +15,7 @@ class ModuleError extends WebpackError {
this.module = module;
this.message = "Module Error";
if(from) {
this.message += ` (from ${from})`;
this.message += ` (@ ${from})`;
}
this.message += ": ";
this.message += err && typeof err === "object" && err.message ? err.message : err;

2
lib/ModuleWarning.js
View File

@ -15,7 +15,7 @@ class ModuleWarning extends WebpackError {
this.module = module;
this.message = "Module Warning";
if(from) {
this.message += ` (from ${from})`;
this.message += ` (@ ${from})`;
}
this.message += ": ";
this.message += warning && typeof warning === "object" && warning.message ? warning.message : warning;

12
test/Errors.test.js
View File

@ -177,7 +177,7 @@ describe("Errors", () => {
done();
});
});
it.only("should show loader name when emit/throw an error or warning from a loader", () => {
it("should show loader name when emit/throw an error or warning from a loader", () => {
return Promise.all([
getErrorsPromise({
mode: "development",
@ -196,10 +196,10 @@ describe("Errors", () => {
}, (errors, warnings) => {
warnings.length.should.be.eql(1);
warnings[0].split("\n")[1].should.match(/^Module Warning \(from emit-error-loader\)/);
warnings[0].split("\n")[1].should.match(/^Module Warning \(@ emit-error-loader\)/);
errors.length.should.be.eql(2);
errors[0].split("\n")[1].should.match(/^Module Error \(from emit-error-loader\)/);
errors[1].split("\n")[1].should.match(/^Module build failed \(from json-loader\)/);
errors[0].split("\n")[1].should.match(/^Module Error \(@ emit-error-loader\)/);
errors[1].split("\n")[1].should.match(/^Module build failed \(@ json-loader\)/);
}),
getErrorsPromise({
mode: "development",
@ -213,7 +213,7 @@ describe("Errors", () => {
}, (errors, warnings) => {
errors.length.should.be.eql(1);
errors[0].split("\n")[1].should.match(/^Module build failed \(from async-error-loader\)/);
errors[0].split("\n")[1].should.match(/^Module build failed \(@ async-error-loader\)/);
}),
getErrorsPromise({
mode: "development",
@ -227,7 +227,7 @@ describe("Errors", () => {
}, (errors, warnings) => {
errors.length.should.be.eql(1);
errors[0].split("\n")[1].should.match(/^Module build failed \(from throw-error-loader\)/);
errors[0].split("\n")[1].should.match(/^Module build failed \(@ throw-error-loader\)/);
}),
]);

4
test/cases/compile/error-hide-stack/errors.js
View File

@ -1,3 +1,3 @@
module.exports = [
[/Module build failed: Message\nStack/]
];
[/Module build failed( \(@ [^)]+\))?: Message\nStack/]
];