Merge pull request #55 from conversation/18249-upgrade-uglifier

Upgrade uglifier
conversation · Oct 30, 2024 · 7dac6c8 · 7dac6c8
2 parents 6b4113e + 8ccdb55
commit 7dac6c8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/Cakefile b/Cakefile
@@ -34,17 +34,20 @@ makeUgly = (infile, outfile) ->
   # Uglify compile the JS
   source = cat infile
 
-  {parser, uglify} = require 'uglify-js'
+  UglifyJS = require 'uglify-js'
 
-  opts =
-    defines:
-      WEB: ['name', 'true']
+  unminifiedCode = fs.readFileSync(infile, "utf8")
 
-  ast = parser.parse source
-  ast = uglify.ast_lift_variables ast
-  ast = uglify.ast_mangle ast, opts
-  ast = uglify.ast_squeeze ast
-  code = uglify.gen_code ast
+  result = UglifyJS.minify(unminifiedCode, {
+    compress: {
+      global_defs: {
+        "WEB": true
+      },
+      hoist_vars: true
+    }
+  })
+
+  code = result.code
 
   smaller = Math.round((1 - (code.length / source.length)) * 100)
 

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "optimist": ">= 0.2.4",
     "nodeunit": "0.9.0",
     "shelljs": "0.1.4",
-    "uglify-js": "1.3.5",
+    "uglify-js": "3.19.3",
     "websocket": "~1"
   },
   "engine": "node >= 0.6",

diff --git a/webclient/json.js b/webclient/json.js
diff --git a/webclient/share.js b/webclient/share.js
diff --git a/webclient/text-tp2.js b/webclient/text-tp2.js
diff --git a/webclient/text2.js b/webclient/text2.js