From 0f638cf45e07daa997ee9cbf782f1365400747ac Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 1 Mar 2017 09:38:40 +0200
Subject: [PATCH 1/2] Update uglify-js to v2.8.3.

---
 Gruntfile.js                                           |  4 ++--
 package.json                                           |  2 +-
 tasks/lib/uglify.js                                    |  2 +-
 test/fixtures/expected/beautify.js                     |  4 ++--
 test/fixtures/expected/compress.js                     |  2 +-
 test/fixtures/expected/compress_explicit.js            |  2 +-
 test/fixtures/expected/compress_mangle.js              |  2 +-
 test/fixtures/expected/compress_mangle_banner.js       |  2 +-
 test/fixtures/expected/compress_mangle_beautify.js     |  2 +-
 test/fixtures/expected/compress_mangle_except.js       |  2 +-
 .../expected/deep/directory/location/source_map.js.map |  2 +-
 test/fixtures/expected/exportAll.js                    |  2 +-
 test/fixtures/expected/mangle.js                       |  2 +-
 .../expected/mangleprops_withNameCacheFile2.js         |  2 +-
 test/fixtures/expected/maxLineLen.js                   | 10 +++++-----
 test/fixtures/expected/multifile.js                    |  2 +-
 test/fixtures/expected/quotes_double.js                |  2 +-
 test/fixtures/expected/quotes_original.js              |  2 +-
 test/fixtures/expected/quotes_single.js                |  2 +-
 test/fixtures/expected/source_map_custom_name          |  2 +-
 test/fixtures/expected/sourcemap_basic.js              |  2 +-
 test/fixtures/expected/sourcemap_basic.js.map          |  2 +-
 test/fixtures/expected/sourcemap_customDir.js          |  2 +-
 test/fixtures/expected/sourcemap_customName.js         |  2 +-
 test/fixtures/expected/sourcemap_customRoot.js         |  2 +-
 test/fixtures/expected/sourcemap_customRoot.js.map     |  2 +-
 test/fixtures/expected/sourcemap_customUrl.js          |  2 +-
 test/fixtures/expected/sourcemap_functionName.js       |  2 +-
 .../fixtures/expected/sourcemap_functionName.js.fn.map |  2 +-
 test/fixtures/expected/sourcemap_sources.js.map        |  2 +-
 test/fixtures/expected/sourcemapin.js                  |  2 +-
 test/fixtures/expected/sourcemapin.js.map              |  2 +-
 test/fixtures/expected/sourcemapin_sources.js          |  2 +-
 test/fixtures/expected/sourcemapin_sources.js.map      |  2 +-
 test/fixtures/expected/sourcemaps_multiple1.js         |  2 +-
 test/fixtures/expected/sourcemaps_multiple1.js.map     |  2 +-
 test/fixtures/expected/sourcemaps_multiple1_fnName.js  |  2 +-
 .../expected/sourcemaps_multiple1_fnName.js.fn.map     |  2 +-
 test/fixtures/expected/wrap.js                         |  2 +-
 39 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 218f86db..08218565 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -385,13 +385,13 @@ module.exports = function(grunt) {
       },
       beautify_Object: {
         files: {
-          'tmp/beautify.js': ['test/fixtures/src/localization.js', 'test/fixtures/src/simple.js']
+          'tmp/beautify.js': ['test/fixtures/src/simple.js']
         },
         options: {
           beautify: {
             ascii_only: true,
             indent_start: 2,
-            max_line_len: 40
+            max_line_len: 55
           }
         }
       }
diff --git a/package.json b/package.json
index a750cad4..b233d642 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "chalk": "^1.0.0",
     "maxmin": "^1.1.0",
     "object.assign": "^4.0.4",
-    "uglify-js": "~2.7.0",
+    "uglify-js": "~2.8.3",
     "uri-path": "^1.0.0"
   },
   "devDependencies": {
diff --git a/tasks/lib/uglify.js b/tasks/lib/uglify.js
index 7a160664..97b74a1e 100644
--- a/tasks/lib/uglify.js
+++ b/tasks/lib/uglify.js
@@ -98,7 +98,7 @@ exports.init = function(grunt) {
         options.compress.screw_ie8 = false;
       }
       var compressor = UglifyJS.Compressor(options.compress);
-      topLevel = topLevel.transform(compressor);
+      topLevel = compressor.compress(topLevel);
 
       // Need to figure out scope again after source being altered
       if (options.expression === false) {
diff --git a/test/fixtures/expected/beautify.js b/test/fixtures/expected/beautify.js
index 665339da..190f8c89 100644
--- a/test/fixtures/expected/beautify.js
+++ b/test/fixtures/expected/beautify.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b;
-}var set=["This is a random set of ch\u03b1racters and strings.","\u8fd9\u662f\u4e00\u7ec4\u968f\u673a\u5b57\u7b26\u548c\u5b57\u7b26\u4e32\u3002","\u042d\u0442\u043e \u0441\u043b\u0443\u0447\u0430\u0439\u043d\u044b\u0439 \u043d\u0430\u0431\u043e\u0440 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432 \u0438 \u0441\u0442\u0440\u043e\u043a","\u0426\xe9 \u0432\u0438\u043f\u0430\u0434\u043a\u043e\u0432\u0438\u0439 \u043d\u0430\u0431\u0456\u0440 \u0441\u0438\u043c\u0432\u043e\u043b\u0456\u0432 \u0442\u0430 \u0440\u044f\u0434\u043a\u0456\u0432"],answer=set[Math.floor(Math.random()*set.length)],longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(a,b){return 3+a+b}
+var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/compress.js b/test/fixtures/expected/compress.js
index a9c123e1..1eb841ff 100644
--- a/test/fixtures/expected/compress.js
+++ b/test/fixtures/expected/compress.js
@@ -1 +1 @@
-function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(argumentC,argumentD){return 3+argumentC+argumentD}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/compress_explicit.js b/test/fixtures/expected/compress_explicit.js
index c66c512d..66e4ff16 100644
--- a/test/fixtures/expected/compress_explicit.js
+++ b/test/fixtures/expected/compress_explicit.js
@@ -1 +1 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/compress_mangle.js b/test/fixtures/expected/compress_mangle.js
index c66c512d..66e4ff16 100644
--- a/test/fixtures/expected/compress_mangle.js
+++ b/test/fixtures/expected/compress_mangle.js
@@ -1 +1 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/compress_mangle_banner.js b/test/fixtures/expected/compress_mangle_banner.js
index 1de7a829..786dd837 100644
--- a/test/fixtures/expected/compress_mangle_banner.js
+++ b/test/fixtures/expected/compress_mangle_banner.js
@@ -1,2 +1,2 @@
 // banner without sourcemap
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/compress_mangle_beautify.js b/test/fixtures/expected/compress_mangle_beautify.js
index 15b03f05..f17c7430 100644
--- a/test/fixtures/expected/compress_mangle_beautify.js
+++ b/test/fixtures/expected/compress_mangle_beautify.js
@@ -1,5 +1,5 @@
 function longFunctionC(a, b) {
-    return longNameA + longNameB + a + b;
+    return 3 + a + b;
 }
 
 var longNameA = 1, longNameB = 2, result = longFunctionC(3, 4);
diff --git a/test/fixtures/expected/compress_mangle_except.js b/test/fixtures/expected/compress_mangle_except.js
index 6830da93..8b97f2ca 100644
--- a/test/fixtures/expected/compress_mangle_except.js
+++ b/test/fixtures/expected/compress_mangle_except.js
@@ -1 +1 @@
-function longFunctionC(argumentC,a){return longNameA+longNameB+argumentC+a}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(argumentC,a){return 3+argumentC+a}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/deep/directory/location/source_map.js.map b/test/fixtures/expected/deep/directory/location/source_map.js.map
index 39dde8e3..3d459f69 100644
--- a/test/fixtures/expected/deep/directory/location/source_map.js.map
+++ b/test/fixtures/expected/deep/directory/location/source_map.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../../../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_customDir.js"}
\ No newline at end of file
+{"version":3,"sources":["../../../../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_customDir.js"}
\ No newline at end of file
diff --git a/test/fixtures/expected/exportAll.js b/test/fixtures/expected/exportAll.js
index 604faa1e..f91b1c2a 100644
--- a/test/fixtures/expected/exportAll.js
+++ b/test/fixtures/expected/exportAll.js
@@ -1 +1 @@
-!function(exports,global){function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}var longNameA=1,longNameB=2,result=longFunctionC(3,4);exports.longNameA=longNameA,exports.longNameB=longNameB,exports.longFunctionC=longFunctionC,exports.result=result,global.testExport=exports}({},function(){return this}());
\ No newline at end of file
+!function(exports,global){function longFunctionC(argumentC,argumentD){return 3+argumentC+argumentD}var result=longFunctionC(3,4);exports.longNameA=1,exports.longNameB=2,exports.longFunctionC=longFunctionC,exports.result=result,global.testExport=exports}({},function(){return this}());
\ No newline at end of file
diff --git a/test/fixtures/expected/mangle.js b/test/fixtures/expected/mangle.js
index c66c512d..66e4ff16 100644
--- a/test/fixtures/expected/mangle.js
+++ b/test/fixtures/expected/mangle.js
@@ -1 +1 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/mangleprops_withNameCacheFile2.js b/test/fixtures/expected/mangleprops_withNameCacheFile2.js
index 92a68ba9..84ee4e70 100644
--- a/test/fixtures/expected/mangleprops_withNameCacheFile2.js
+++ b/test/fixtures/expected/mangleprops_withNameCacheFile2.js
@@ -1 +1 @@
-var d=10;a.a(d);
\ No newline at end of file
+var d=10;a.a(10);
\ No newline at end of file
diff --git a/test/fixtures/expected/maxLineLen.js b/test/fixtures/expected/maxLineLen.js
index fd546576..757c532e 100644
--- a/test/fixtures/expected/maxLineLen.js
+++ b/test/fixtures/expected/maxLineLen.js
@@ -1,5 +1,5 @@
-void function(){var cubes,list,math,number,opposite,race,square;number=42,opposite=!0,opposite&&(number=-42),
-square=function(x){return x*x},list=[1,2,3,4,5],math={root:Math.sqrt,square:square,cube:function(x){return x*square(x);
-}},race=function(winner,runners){return runners=2<=arguments.length?[].slice.call(arguments,1):[],print(winner,runners);
-},"undefined"!=typeof elvis&&null!=elvis&&alert("I knew it!"),cubes=function(accum$){for(var num,i$=0,length$=list.length;i$<length$;++i$)num=list[i$],
-accum$.push(math.cube(num));return accum$}.call(this,[])}.call(this);
\ No newline at end of file
+(function(){var list,math,opposite,square;opposite=!0,square=function(x){return x*x},
+list=[1,2,3,4,5],math={root:Math.sqrt,square:square,cube:function(x){return x*square(x)}},
+"undefined"!=typeof elvis&&null!=elvis&&alert("I knew it!"),function(accum$){
+for(var num,i$=0,length$=list.length;i$<length$;++i$)num=list[i$],accum$.push(math.cube(num))
+;return accum$}.call(this,[])}).call(this);
\ No newline at end of file
diff --git a/test/fixtures/expected/multifile.js b/test/fixtures/expected/multifile.js
index beb6c519..2257b87c 100644
--- a/test/fixtures/expected/multifile.js
+++ b/test/fixtures/expected/multifile.js
@@ -1 +1 @@
-function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}function foo(){return 42}function bar(){return 2*foo()}function baz(){return bar()*bar()}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
+function longFunctionC(argumentC,argumentD){return 3+argumentC+argumentD}function foo(){return 42}function bar(){return 2*foo()}function baz(){return bar()*bar()}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
\ No newline at end of file
diff --git a/test/fixtures/expected/quotes_double.js b/test/fixtures/expected/quotes_double.js
index 29a920cd..d0e5c023 100644
--- a/test/fixtures/expected/quotes_double.js
+++ b/test/fixtures/expected/quotes_double.js
@@ -1 +1 @@
-function llama(){var a="This is a single quote string",b="This is a double quote string",c={this:"is part of an Object",and:"so is this",but:"this one has \"mixed\" quotes: '"};return[a,b,c]}
\ No newline at end of file
+function llama(){return["This is a single quote string","This is a double quote string",{this:"is part of an Object",and:"so is this",but:"this one has \"mixed\" quotes: '"}]}
\ No newline at end of file
diff --git a/test/fixtures/expected/quotes_original.js b/test/fixtures/expected/quotes_original.js
index 296ab5cd..53b15cc6 100644
--- a/test/fixtures/expected/quotes_original.js
+++ b/test/fixtures/expected/quotes_original.js
@@ -1 +1 @@
-function llama(){var a='This is a single quote string',b="This is a double quote string",c={this:"is part of an Object",and:'so is this',but:'this one has "mixed" quotes: \''};return[a,b,c]}
\ No newline at end of file
+function llama(){return["This is a single quote string","This is a double quote string",{this:"is part of an Object",and:'so is this',but:'this one has "mixed" quotes: \''}]}
\ No newline at end of file
diff --git a/test/fixtures/expected/quotes_single.js b/test/fixtures/expected/quotes_single.js
index b7628d32..71c305a8 100644
--- a/test/fixtures/expected/quotes_single.js
+++ b/test/fixtures/expected/quotes_single.js
@@ -1 +1 @@
-function llama(){var a='This is a single quote string',b='This is a double quote string',c={this:'is part of an Object',and:'so is this',but:'this one has "mixed" quotes: \''};return[a,b,c]}
\ No newline at end of file
+function llama(){return['This is a single quote string','This is a double quote string',{this:'is part of an Object',and:'so is this',but:'this one has "mixed" quotes: \''}]}
\ No newline at end of file
diff --git a/test/fixtures/expected/source_map_custom_name b/test/fixtures/expected/source_map_custom_name
index 174aefc0..d9a08abf 100644
--- a/test/fixtures/expected/source_map_custom_name
+++ b/test/fixtures/expected/source_map_custom_name
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_customName.js"}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_customName.js"}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_basic.js b/test/fixtures/expected/sourcemap_basic.js
index 26073b7d..6d377e36 100644
--- a/test/fixtures/expected/sourcemap_basic.js
+++ b/test/fixtures/expected/sourcemap_basic.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=sourcemap_basic.js.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_basic.js.map b/test/fixtures/expected/sourcemap_basic.js.map
index 87ade48a..032866fa 100644
--- a/test/fixtures/expected/sourcemap_basic.js.map
+++ b/test/fixtures/expected/sourcemap_basic.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_basic.js"}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_basic.js"}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_customDir.js b/test/fixtures/expected/sourcemap_customDir.js
index 3ee9114a..0a64b393 100644
--- a/test/fixtures/expected/sourcemap_customDir.js
+++ b/test/fixtures/expected/sourcemap_customDir.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=deep/directory/location/source_map.js.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_customName.js b/test/fixtures/expected/sourcemap_customName.js
index 133ca52f..9a13aa30 100644
--- a/test/fixtures/expected/sourcemap_customName.js
+++ b/test/fixtures/expected/sourcemap_customName.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=source_map_custom_name
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_customRoot.js b/test/fixtures/expected/sourcemap_customRoot.js
index 98fe505f..9b37d41c 100644
--- a/test/fixtures/expected/sourcemap_customRoot.js
+++ b/test/fixtures/expected/sourcemap_customRoot.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=sourcemap_customRoot.js.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_customRoot.js.map b/test/fixtures/expected/sourcemap_customRoot.js.map
index b90cfe9d..b05fe8fb 100644
--- a/test/fixtures/expected/sourcemap_customRoot.js.map
+++ b/test/fixtures/expected/sourcemap_customRoot.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_customRoot.js","sourceRoot":"https://github.com/RReverser/grunt-contrib-uglify/tree/master/tmp"}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_customRoot.js","sourceRoot":"https://github.com/RReverser/grunt-contrib-uglify/tree/master/tmp"}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_customUrl.js b/test/fixtures/expected/sourcemap_customUrl.js
index c063d4b6..7ea63c0c 100644
--- a/test/fixtures/expected/sourcemap_customUrl.js
+++ b/test/fixtures/expected/sourcemap_customUrl.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=http://www.test.com/test/sourcemap_customUrl.js.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_functionName.js b/test/fixtures/expected/sourcemap_functionName.js
index 448cc3a9..15efe03c 100644
--- a/test/fixtures/expected/sourcemap_functionName.js
+++ b/test/fixtures/expected/sourcemap_functionName.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=sourcemap_functionName.js.fn.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_functionName.js.fn.map b/test/fixtures/expected/sourcemap_functionName.js.fn.map
index 226ffab1..44db10a1 100644
--- a/test/fixtures/expected/sourcemap_functionName.js.fn.map
+++ b/test/fixtures/expected/sourcemap_functionName.js.fn.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_functionName.js"}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_functionName.js"}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemap_sources.js.map b/test/fixtures/expected/sourcemap_sources.js.map
index dd2b1f64..e4ed41d7 100644
--- a/test/fixtures/expected/sourcemap_sources.js.map
+++ b/test/fixtures/expected/sourcemap_sources.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_sources.js","sourcesContent":["\n// Hello world, I'm a comment!\n\nvar longNameA = 1;\n\nvar longNameB = 2;\n\nfunction longFunctionC(argumentC,argumentD) {\n  return longNameA + longNameB + argumentC + argumentD;\n}\n\nvar result = longFunctionC(3,4);\n\n/*! I might be preserved, yay! */\n\n"]}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemap_sources.js","sourcesContent":["\n// Hello world, I'm a comment!\n\nvar longNameA = 1;\n\nvar longNameB = 2;\n\nfunction longFunctionC(argumentC,argumentD) {\n  return longNameA + longNameB + argumentC + argumentD;\n}\n\nvar result = longFunctionC(3,4);\n\n/*! I might be preserved, yay! */\n\n"]}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemapin.js b/test/fixtures/expected/sourcemapin.js
index 558eaeb7..a69d278e 100644
--- a/test/fixtures/expected/sourcemapin.js
+++ b/test/fixtures/expected/sourcemapin.js
@@ -1,4 +1,4 @@
 // Hello World
 
-void function(){var cubes,list,math,number,opposite,race,square;number=42,opposite=!0,opposite&&(number=-42),square=function(x){return x*x},list=[1,2,3,4,5],math={root:Math.sqrt,square:square,cube:function(x){return x*square(x)}},race=function(winner,runners){return runners=2<=arguments.length?[].slice.call(arguments,1):[],print(winner,runners)},"undefined"!=typeof elvis&&null!=elvis&&alert("I knew it!"),cubes=function(accum$){for(var num,i$=0,length$=list.length;i$<length$;++i$)num=list[i$],accum$.push(math.cube(num));return accum$}.call(this,[])}.call(this);
+(function(){var list,math,opposite,square;opposite=!0,square=function(x){return x*x},list=[1,2,3,4,5],math={root:Math.sqrt,square:square,cube:function(x){return x*square(x)}},"undefined"!=typeof elvis&&null!=elvis&&alert("I knew it!"),function(accum$){for(var num,i$=0,length$=list.length;i$<length$;++i$)num=list[i$],accum$.push(math.cube(num));return accum$}.call(this,[])}).call(this);
 //# sourceMappingURL=sourcemapin.js.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemapin.js.map b/test/fixtures/expected/sourcemapin.js.map
index 6a6db4c7..d51b3582 100644
--- a/test/fixtures/expected/sourcemapin.js.map
+++ b/test/fixtures/expected/sourcemapin.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple2.coffee"],"names":["number","opposite","square","x","list","math","root","Math","sqrt","cube","race","winner","runners","arguments","length","slice","call","print","elvis","alert","cubes","accum$","i$","length$","num"],"mappings":";;+DACCA,QAAW,GACXC,UAAW,EAGKA,WAAhBD,QAAS,IAGTE,OAAS,SAAAC,SAAOA,GAAIA,GAGpBC,MAAQ,EAAG,EAAG,EAAG,EAAG,GAGpBC,MACGC,KAAQC,KAAIC,KACbN,OAAQA,OACRO,KAAQ,SAAAN,SAAOA,GAAID,OAAOC,KAG1BO,KAAO,SAAAC,OAAAC,eAASA,SAAA,GAAAC,UAAAC,UAAAC,MAAAC,KAAAH,UAAA,MACfI,MAAMN,OAAQC,UAGf,mBAAsBM,QAAA,MAAAA,OAAtBC,MAAM,cAGRC,MAAA,SAAAC,QAAS,IAAA,QAAAC,GAAA,EAAAC,QAAyBnB,KAAAU,OAAzBQ,GAAAC,UAAAD,GAAkBE,IAAOpB,KAAAkB,gBAAzBjB,KAAII,KAAMe","file":"sourcemapin.js","sourcesContent":["# Assignment:\nnumber   = 42\nopposite = true\n\n# Conditions:\nnumber = -42 if opposite\n\n# Functions:\nsquare = (x) -> x * x\n\n# Arrays:\nlist = [1, 2, 3, 4, 5]\n\n# Objects:\nmath =\n  root:   Math.sqrt\n  square: square\n  cube:   (x) -> x * square x\n\n# Splats:\nrace = (winner, runners...) ->\n  print winner, runners\n\n# Existence:\nalert \"I knew it!\" if elvis?\n\n# Array comprehensions:\ncubes = (math.cube num for num in list)"]}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple2.coffee"],"names":["opposite","square","x","list","math","root","Math","sqrt","cube","elvis","alert","accum$","i$","length$","length","num"],"mappings":";;yCAECA,WAAW,EAMXC,OAAS,SAAAC,SAAOA,GAAIA,GAGpBC,MAAQ,EAAG,EAAG,EAAG,EAAG,GAGpBC,MACGC,KAAQC,KAAIC,KACbN,OAAQA,OACRO,KAAQ,SAAAN,SAAOA,GAAID,OAAOC,KAO1B,mBAAsBO,QAAA,MAAAA,OAAtBC,MAAM,cAGR,SAAAC,QAAS,IAAA,QAAAC,GAAA,EAAAC,QAAyBV,KAAAW,OAAzBF,GAAAC,UAAAD,GAAkBG,IAAOZ,KAAAS,gBAAzBR,KAAII,KAAMO","file":"sourcemapin.js","sourcesContent":["# Assignment:\nnumber   = 42\nopposite = true\n\n# Conditions:\nnumber = -42 if opposite\n\n# Functions:\nsquare = (x) -> x * x\n\n# Arrays:\nlist = [1, 2, 3, 4, 5]\n\n# Objects:\nmath =\n  root:   Math.sqrt\n  square: square\n  cube:   (x) -> x * square x\n\n# Splats:\nrace = (winner, runners...) ->\n  print winner, runners\n\n# Existence:\nalert \"I knew it!\" if elvis?\n\n# Array comprehensions:\ncubes = (math.cube num for num in list)"]}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemapin_sources.js b/test/fixtures/expected/sourcemapin_sources.js
index e73be28e..44a03400 100644
--- a/test/fixtures/expected/sourcemapin_sources.js
+++ b/test/fixtures/expected/sourcemapin_sources.js
@@ -1,2 +1,2 @@
-void function(){var a,b,c,d,e,f,g;d=42,e=!0,e&&(d=-42),g=function(a){return a*a},b=[1,2,3,4,5],c={root:Math.sqrt,square:g,cube:function(a){return a*g(a)}},f=function(a,b){return b=2<=arguments.length?[].slice.call(arguments,1):[],print(a,b)},"undefined"!=typeof elvis&&null!=elvis&&alert("I knew it!"),a=function(a){for(var d,e=0,f=b.length;e<f;++e)d=b[e],a.push(c.cube(d));return a}.call(this,[])}.call(this);
+(function(){var a,b,c,d;c=!0,d=function(a){return a*a},a=[1,2,3,4,5],b={root:Math.sqrt,square:d,cube:function(a){return a*d(a)}},"undefined"!=typeof elvis&&null!=elvis&&alert("I knew it!"),function(c){for(var d,e=0,f=a.length;e<f;++e)d=a[e],c.push(b.cube(d));return c}.call(this,[])}).call(this);
 //# sourceMappingURL=sourcemapin_sources.js.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemapin_sources.js.map b/test/fixtures/expected/sourcemapin_sources.js.map
index 113a5968..ec9a23a2 100644
--- a/test/fixtures/expected/sourcemapin_sources.js.map
+++ b/test/fixtures/expected/sourcemapin_sources.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple2.coffee"],"names":["number","opposite","square","x","list","math","root","Math","sqrt","cube","race","winner","runners","arguments","length","slice","call","print","elvis","alert","cubes","accum$","i$","length$","num"],"mappings":"iCACCA,GAAW,GACXC,GAAW,EAGKA,IAAhBD,GAAS,IAGTE,EAAS,SAAAC,SAAOA,GAAIA,GAGpBC,GAAQ,EAAG,EAAG,EAAG,EAAG,GAGpBC,GACGC,KAAQC,KAAIC,KACbN,OAAQA,EACRO,KAAQ,SAAAN,SAAOA,GAAID,EAAOC,KAG1BO,EAAO,SAAAC,EAAAC,SAASA,GAAA,GAAAC,UAAAC,UAAAC,MAAAC,KAAAH,UAAA,MACfI,MAAMN,EAAQC,IAGf,mBAAsBM,QAAA,MAAAA,OAAtBC,MAAM,cAGRC,EAAA,SAAAC,GAAS,IAAA,MAAAC,EAAA,EAAAC,EAAyBnB,EAAAU,OAAzBQ,EAAAC,IAAAD,EAAkBE,EAAOpB,EAAAkB,UAAzBjB,EAAII,KAAMe","file":"sourcemapin_sources.js","sourcesContent":["# Assignment:\nnumber   = 42\nopposite = true\n\n# Conditions:\nnumber = -42 if opposite\n\n# Functions:\nsquare = (x) -> x * x\n\n# Arrays:\nlist = [1, 2, 3, 4, 5]\n\n# Objects:\nmath =\n  root:   Math.sqrt\n  square: square\n  cube:   (x) -> x * square x\n\n# Splats:\nrace = (winner, runners...) ->\n  print winner, runners\n\n# Existence:\nalert \"I knew it!\" if elvis?\n\n# Array comprehensions:\ncubes = (math.cube num for num in list)"]}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple2.coffee"],"names":["opposite","square","x","list","math","root","Math","sqrt","cube","elvis","alert","accum$","i$","length$","length","num"],"mappings":"uBAECA,IAAW,EAMXC,EAAS,SAAAC,SAAOA,GAAIA,GAGpBC,GAAQ,EAAG,EAAG,EAAG,EAAG,GAGpBC,GACGC,KAAQC,KAAIC,KACbN,OAAQA,EACRO,KAAQ,SAAAN,SAAOA,GAAID,EAAOC,KAO1B,mBAAsBO,QAAA,MAAAA,OAAtBC,MAAM,cAGR,SAAAC,GAAS,IAAA,MAAAC,EAAA,EAAAC,EAAyBV,EAAAW,OAAzBF,EAAAC,IAAAD,EAAkBG,EAAOZ,EAAAS,UAAzBR,EAAII,KAAMO","file":"sourcemapin_sources.js","sourcesContent":["# Assignment:\nnumber   = 42\nopposite = true\n\n# Conditions:\nnumber = -42 if opposite\n\n# Functions:\nsquare = (x) -> x * x\n\n# Arrays:\nlist = [1, 2, 3, 4, 5]\n\n# Objects:\nmath =\n  root:   Math.sqrt\n  square: square\n  cube:   (x) -> x * square x\n\n# Splats:\nrace = (winner, runners...) ->\n  print winner, runners\n\n# Existence:\nalert \"I knew it!\" if elvis?\n\n# Array comprehensions:\ncubes = (math.cube num for num in list)"]}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemaps_multiple1.js b/test/fixtures/expected/sourcemaps_multiple1.js
index 69953e78..21bb928e 100644
--- a/test/fixtures/expected/sourcemaps_multiple1.js
+++ b/test/fixtures/expected/sourcemaps_multiple1.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=sourcemaps_multiple1.js.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemaps_multiple1.js.map b/test/fixtures/expected/sourcemaps_multiple1.js.map
index fe9ca2f3..a205df0e 100644
--- a/test/fixtures/expected/sourcemaps_multiple1.js.map
+++ b/test/fixtures/expected/sourcemaps_multiple1.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemaps_multiple1.js"}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemaps_multiple1.js"}
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemaps_multiple1_fnName.js b/test/fixtures/expected/sourcemaps_multiple1_fnName.js
index 4e0e3f93..9667278d 100644
--- a/test/fixtures/expected/sourcemaps_multiple1_fnName.js
+++ b/test/fixtures/expected/sourcemaps_multiple1_fnName.js
@@ -1,2 +1,2 @@
-function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
+function longFunctionC(a,b){return 3+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);
 //# sourceMappingURL=sourcemaps_multiple1_fnName.js.fn.map
\ No newline at end of file
diff --git a/test/fixtures/expected/sourcemaps_multiple1_fnName.js.fn.map b/test/fixtures/expected/sourcemaps_multiple1_fnName.js.fn.map
index 8a99578f..a0d5d082 100644
--- a/test/fixtures/expected/sourcemaps_multiple1_fnName.js.fn.map
+++ b/test/fixtures/expected/sourcemaps_multiple1_fnName.js.fn.map
@@ -1 +1 @@
-{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemaps_multiple1_fnName.js"}
\ No newline at end of file
+{"version":3,"sources":["../test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,GAAwBF,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE","file":"sourcemaps_multiple1_fnName.js"}
\ No newline at end of file
diff --git a/test/fixtures/expected/wrap.js b/test/fixtures/expected/wrap.js
index 47235434..6ba28895 100644
--- a/test/fixtures/expected/wrap.js
+++ b/test/fixtures/expected/wrap.js
@@ -1 +1 @@
-!function(exports,global){function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}var longNameA=1,longNameB=2;longFunctionC(3,4);global.testExport=exports}({},function(){return this}());
\ No newline at end of file
+!function(exports,global){function longFunctionC(argumentC,argumentD){return 3+argumentC+argumentD}longFunctionC(3,4);global.testExport=exports}({},function(){return this}());
\ No newline at end of file

From 48247f680a2aa62643828d40521d0cdd4fd050fe Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 1 Mar 2017 09:39:04 +0200
Subject: [PATCH 2/2] v2.2.0.

---
 CHANGELOG    | 4 ++++
 README.md    | 5 +++--
 package.json | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 508146be..5cc77536 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v2.2.0:
+  date: 2017-03-01
+  changes:
+    - Update uglify-js to v2.8.3.
 v2.1.0:
   date: 2017-02-08
   changes:
diff --git a/README.md b/README.md
index 6ec9639b..fdb622d5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# grunt-contrib-uglify v2.1.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-uglify.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-uglify) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/ybtf5vbvtenii561/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-uglify/branch/master)
+# grunt-contrib-uglify v2.2.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-uglify.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-uglify) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/ybtf5vbvtenii561/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-uglify/branch/master)
 
 > Minify JavaScript files with UglifyJS
 
@@ -549,6 +549,7 @@ grunt.initConfig({
 
 ## Release History
 
+ * 2017-03-01   v2.2.0   Update uglify-js to v2.8.3.
  * 2017-02-08   v2.1.0   Show size changes in output. Switch to `object.assign`.
  * 2016-07-19   v2.0.0   Update uglify-js to v2.7.0. `screwIE8` is enabled by default.
  * 2016-07-19   v1.0.2   Update grunt to ^1.0.0. Fix `beautify` when passed as an object. Fix docs about `report` values.
@@ -589,4 +590,4 @@ grunt.initConfig({
 
 Task submitted by ["Cowboy" Ben Alman](http://benalman.com)
 
-*This file was generated on Tue Feb 28 2017 15:58:04.*
+*This file was generated on Wed Mar 01 2017 09:37:05.*
diff --git a/package.json b/package.json
index b233d642..93b24a4c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-contrib-uglify",
   "description": "Minify JavaScript files with UglifyJS",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "author": {
     "name": "Grunt Team",
     "url": "http://gruntjs.com/"