opensourcemirror
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

multi line message when "from" is set

This commit is contained in:
Tobias Koppers 2018-06-05 10:43:10 +02:00
parent 9fbe914078
commit c77030573d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ModuleBuildError.js
View File

@ -12,9 +12,10 @@ class ModuleBuildError extends WebpackError {
let message = "Module build failed"; let message = "Module build failed";
let details = undefined; let details = undefined;
if (from) { if (from) {
message += ` (from ${from})`; message += ` (from ${from}):\n`;
} else {
message += ": ";
} }
message += ": ";
if (err !== null && typeof err === "object") { if (err !== null && typeof err === "object") {
if (typeof err.stack === "string" && err.stack) { if (typeof err.stack === "string" && err.stack) {
const stack = cutOffLoaderExecution(err.stack); const stack = cutOffLoaderExecution(err.stack);

8
lib/ModuleError.js
View File

@ -11,12 +11,14 @@ class ModuleError extends WebpackError {
constructor(module, err, { from = null } = {}) { constructor(module, err, { from = null } = {}) {
let message = "Module Error"; let message = "Module Error";
if (from) { if (from) {
message += ` (from ${from})`; message += ` (from ${from}):\n`;
} else {
message += ": ";
} }
if (err && typeof err === "object" && err.message) { if (err && typeof err === "object" && err.message) {
message += `:\n${err.message}`; message += err.message;
} else if (err) { } else if (err) {
message += `:\n${err}`; message += err;
} }
super(message); super(message);
this.name = "ModuleError"; this.name = "ModuleError";

8
lib/ModuleWarning.js
View File

@ -11,12 +11,14 @@ class ModuleWarning extends WebpackError {
constructor(module, warning, { from = null } = {}) { constructor(module, warning, { from = null } = {}) {
let message = "Module Warning"; let message = "Module Warning";
if (from) { if (from) {
message += ` (from ${from})`; message += ` (from ${from}):\n`;
} else {
message += ": ";
} }
if (warning && typeof warning === "object" && warning.message) { if (warning && typeof warning === "object" && warning.message) {
message += `:\n${warning.message}`; message += warning.message;
} else if (warning) { } else if (warning) {
message += `:\n${warning}`; message += warning;
} }
super(message); super(message);
this.name = "ModuleWarning"; this.name = "ModuleWarning";