Merge branch 'master' into harmony-v3.1.10

2017-11-19 14:34:27 +08:00
parent f25bd13be6 667fc4d08b
commit 227b58812d
10 changed files with 935 additions and 232 deletions
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -15,7 +15,7 @@ var path = require("path");
 var program = require("commander");
 var UglifyJS = require("../tools/node");

-var skip_keys = [ "cname", "enclosed", "parent_scope", "scope", "thedef", "uses_eval", "uses_with" ];
+var skip_keys = [ "cname", "enclosed", "inlined", "parent_scope", "scope", "thedef", "uses_eval", "uses_with" ];
 var files = {};
 var options = {
    compress: false,