Merge branch 'master' into harmony-v3.2.0

2017-11-26 04:23:57 +08:00
parent ba4894af18 b37a68c84f
commit 4f08c2f504
12 changed files with 967 additions and 103 deletions
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "homepage": "https://github.com/mishoo/UglifyJS2/tree/harmony",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.1.10",
+  "version": "3.2.0",
  "engines": {
    "node": ">=0.8.0"
  },
@@ -26,11 +26,11 @@
    "LICENSE"
  ],
  "dependencies": {
-    "commander": "~2.11.0",
+    "commander": "~2.12.1",
    "source-map": "~0.6.1"
  },
  "devDependencies": {
-    "acorn": "~5.1.1",
+    "acorn": "~5.2.1",
    "mocha": "~3.5.1",
    "semver": "~5.4.1"
  },