Merge branch 'master' into harmony-v3.0.0

2017-05-07 07:18:15 +08:00
parent 73d6438773 2d99d06601
commit b4c18f6b83
83 changed files with 9768 additions and 8722 deletions
--- a/test/mocha/builtins.js
+++ b/test/mocha/builtins.js
@@ -7,7 +7,7 @@ describe("builtins", function() {
            "    return [Object,Array,Function,Number,String,Boolean,Error,Math,Date,RegExp,Symbol,Map,Promise,Proxy,Reflect,Set,WeakMap,WeakSet,Float32Array,something];\n" +
            "};";

-        var result = UglifyJS.minify(test, {fromString: true, parse: {bare_returns: true}}).code;
+        var result = UglifyJS.minify(test, {parse: {bare_returns: true}}).code;

        assert.strictEqual(result.indexOf("something"), -1);