Update uglify-es options to use recommended features. Closes gh-1261

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
tessel · Jun 28, 2017 · 241e1f1 · 241e1f1
1 parent 8ba8a95
commit 241e1f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/lib/tessel/deployment/javascript.js b/lib/tessel/deployment/javascript.js
@@ -759,12 +759,14 @@ exportables.compress = function(source, options) {
     cascade: true,
     conditionals: true,
     comparisons: true,
+    ecma: 6,
     evaluate: true,
     hoist_funs: true,
     hoist_vars: true,
     if_return: true,
     join_vars: true,
     loops: true,
+    passes: 3,
     properties: true,
     sequences: true,
     unsafe: true,
@@ -783,20 +785,26 @@ exportables.compress = function(source, options) {
     toplevel: true,
   };
 
+  const output = {
+    ecma: 6,
+  };
+
   const parse = {
     bare_returns: true,
     shebang: true,
   };
 
   Object.assign(compress, options.compress || {});
   Object.assign(mangle, options.mangle || {});
+  Object.assign(output, options.output || {});
   Object.assign(parse, options.parse || {});
 
   const uOptions = {
     toplevel: true,
     warnings: false,
     compress,
     mangle,
+    output,
     parse,
   };
 

diff --git a/lib/tessel/deployment/lists/javascript.js b/lib/tessel/deployment/lists/javascript.js
@@ -45,23 +45,6 @@ module.exports = {
   },
   compressionOptions: {
     'extend': {
-      special: {
-        /*
-          The "extend" module uses the following unadvisable pattern:
-
-          module.exports = function NAME() {
-            ... later calls NAME()
-          };
-
-          UglifyJS's compression algorithm wants to remove that unnecessary
-          function expression _name_. That's ok, because we can just as
-          easily use `keep_fnames: true` to avoid that removal. Unfortunately,
-          that's not enough in this case, as mangling produces sometimes
-          requires another pass with `figure_out_scope` to avoid
-          unhygienic mangling.
-        */
-        rescope_after_mangle: true
-      },
       compress: {
         keep_fnames: true
       },

diff --git a/test/unit/deployment/javascript.js b/test/unit/deployment/javascript.js
@@ -290,20 +290,22 @@ exports['deployment.js.compress'] = {
   },
 
   noOptionsCompress(test) {
-    test.expect(20);
+    test.expect(22);
 
     const optionsCompress = {
       // ------
       booleans: true,
       cascade: true,
       conditionals: true,
       comparisons: true,
+      ecma: 6,
       evaluate: true,
       hoist_funs: true,
       hoist_vars: true,
       if_return: true,
       join_vars: true,
       loops: true,
+      passes: 3,
       properties: true,
       sequences: true,
       unsafe: true,
@@ -332,20 +334,22 @@ exports['deployment.js.compress'] = {
   },
 
   ourOptionsCompress(test) {
-    test.expect(20);
+    test.expect(22);
 
     const ourExplicitSettings = {
       // ------
       booleans: true,
       cascade: true,
       conditionals: true,
       comparisons: true,
+      ecma: 6,
       evaluate: true,
       hoist_funs: true,
       hoist_vars: true,
       if_return: true,
       join_vars: true,
       loops: true,
+      passes: 3,
       properties: true,
       sequences: true,
       unsafe: true,
@@ -3326,9 +3330,6 @@ exports['deployment.js.lists'] = {
      */
     var compressionOptions = {
       extend: {
-        special: {
-          rescope_after_mangle: true
-        },
         compress: {
           keep_fnames: true
         },