Merge pull request #4125 from willmendesneto/refactor-module-build-error

refactor(ModuleBuildError): upgrade to ES6
This commit is contained in:
Tobias Koppers 2017-02-03 14:26:54 +01:00 committed by GitHub
commit 41dfaf2dc9
1 changed files with 37 additions and 32 deletions

View File

@ -2,40 +2,45 @@
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra
*/
var loaderFlag = "LOADER_EXECUTION";
"use strict";
function ModuleBuildError(module, err) {
Error.call(this);
Error.captureStackTrace(this, ModuleBuildError);
this.name = "ModuleBuildError";
this.message = "Module build failed: ";
if(err !== null && typeof err === "object") {
if(typeof err.stack === "string" && err.stack) {
var stack = err.stack.split("\n");
for(var i = 0; i < stack.length; i++)
if(stack[i].indexOf(loaderFlag) >= 0)
stack.length = i;
stack = stack.join("\n");
if(!err.hideStack) {
this.message += stack;
} else {
this.details = stack;
if(typeof err.message === "string" && err.message) {
this.message += err.message;
} else {
this.message += err;
}
}
} else if(typeof err.message === "string" && err.message) {
this.message += err.message;
} else {
this.message += err;
const loaderFlag = "LOADER_EXECUTION";
class ModuleBuildError extends Error {
constructor(module, err) {
super();
if(Error.hasOwnProperty("captureStackTrace")) {
Error.captureStackTrace(this, this.constructor);
}
this.name = "ModuleBuildError";
this.message = "Module build failed: ";
if(err !== null && typeof err === "object") {
if(typeof err.stack === "string" && err.stack) {
var stack = err.stack.split("\n");
for(var i = 0; i < stack.length; i++)
if(stack[i].indexOf(loaderFlag) >= 0)
stack.length = i;
stack = stack.join("\n");
if(!err.hideStack) {
this.message += stack;
} else {
this.details = stack;
if(typeof err.message === "string" && err.message) {
this.message += err.message;
} else {
this.message += err;
}
}
} else if(typeof err.message === "string" && err.message) {
this.message += err.message;
} else {
this.message += err;
}
}
this.module = module;
this.error = err;
}
this.module = module;
this.error = err;
}
module.exports = ModuleBuildError;
ModuleBuildError.prototype = Object.create(Error.prototype);
ModuleBuildError.prototype.constructor = ModuleBuildError;
module.exports = ModuleBuildError;