JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gracefully handle non-Error being thrown (#1893)

Browse Source
This commit is contained in:
Alex Lam S.L
2017-05-10 04:20:59 +08:00
committed by GitHub
parent 41996be86f
commit a0f5f862df
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/uglifyjs
View File

@@ -193,7 +193,7 @@ function run() {
} }
} }
} catch (ex) { } catch (ex) {
fatal(ex.stack); fatal(ex);
} }
var result = UglifyJS.minify(files, options); var result = UglifyJS.minify(files, options);
if (result.error) { if (result.error) {
@@ -220,7 +220,7 @@ function run() {
console.error("Supported options:"); console.error("Supported options:");
console.error(ex.defs); console.error(ex.defs);
} }
fatal(ex.stack); fatal(ex);
} else if (program.output == "ast") { } else if (program.output == "ast") {
console.log(JSON.stringify(result.ast, function(key, value) { console.log(JSON.stringify(result.ast, function(key, value) {
if (skip_key(key)) return; if (skip_key(key)) return;
@@ -263,7 +263,8 @@ function run() {
} }
function fatal(message) { function fatal(message) {
console.error(message.replace(/^\S*?Error:/, "ERROR:")); if (message instanceof Error) message = message.stack.replace(/^\S*?Error:/, "ERROR:")
console.error(message);
process.exit(1); process.exit(1);
} }
@@ -303,7 +304,7 @@ function read_file(path, default_value) {
return fs.readFileSync(path, "utf8"); return fs.readFileSync(path, "utf8");
} catch (ex) { } catch (ex) {
if (ex.code == "ENOENT" && default_value != null) return default_value; if (ex.code == "ENOENT" && default_value != null) return default_value;
fatal(ex.stack); fatal(ex);
} }
} }