gruntjs · Jun 15, 2015 · Sep 11, 2015 · Sep 19, 2015 · Sep 23, 2015 · Oct 11, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: false
 language: node_js
 node_js:
-  - 'iojs'
+  - '4'
   - '0.12'
   - '0.10'
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+v0.10.0:
+  date: 2015-10-27
+  changes:
+    - bump to uglify ^2.5
 v0.9.2:
   date: 2015-08-24
   changes:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# grunt-contrib-uglify v0.9.2 [![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 v0.10.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 files with UglifyJS
 
@@ -168,44 +168,44 @@ Turn on preservation of comments.
 
 #### banner
 Type: `String`  
-Default: empty string
+Default: `''`
 
 This string will be prepended to the minified output.  Template strings (e.g. `<%= config.value %>` will be expanded automatically.
 
 #### footer
 Type: `String`  
-Default: empty string
+Default: `''`
 
 This string will be appended to the minified output.  Template strings (e.g. `<%= config.value %>` will be expanded automatically.
 
 #### screwIE8
 Type: `Boolean`  
-Default: false
+Default: `false`
 
 Pass this flag if you don't care about full compliance with Internet Explorer 6-8 quirks.
 
 #### mangleProperties
 Type: `Boolean`  
-Default: false
+Default: `false`
 
 Use this flag to turn on object property name mangling.
 
 #### reserveDOMProperties
 Type: `Boolean`  
-Default: false
+Default: `false`
 
 Use this flag in conjunction with `mangleProperties` to prevent built-in browser object properties from being mangled.
 
 #### exceptionsFiles
 Type: `Array`  
-Default: []
+Default: `[]`
 
 Use this with `mangleProperties` to pass one or more JSON files containing a list of variables and object properties
 that should not be mangled. See the [UglifyJS docs](https://www.npmjs.com/package/uglify-js) for more info on the file syntax.
 
 #### nameCache
 Type: `String`  
-Default: empty string
+Default: `''`
 
 A string that is a path to a JSON cache file that uglify will create and use to coordinate symbol mangling between
 multiple runs of uglify. Note: this generated file uses the same JSON format as the `exceptionsFiles` files.
@@ -334,7 +334,7 @@ Refer to the [UglifyJS SourceMap Documentation](http://lisperator.net/uglifyjs/c
 #### Turn off console warnings
 
 Specify `drop_console: true` as part of the `compress` options to discard calls to `console.*` functions.
-This will supress warning messages in the console.
+This will suppress warning messages in the console.
 
 ```js
 // Project configuration.
@@ -511,6 +511,7 @@ grunt.initConfig({
 
 ## Release History
 
+ * 2015-10-27   v0.10.0   bump to uglify ^2.5
  * 2015-08-24   v0.9.2   bump to uglify ^2.4.24
  * 2015-04-07   v0.9.1   more fixes for mangle options
  * 2015-04-07   v0.9.0   added hook into uglify's mangling functionality
@@ -542,4 +543,4 @@ grunt.initConfig({
 
 Task submitted by ["Cowboy" Ben Alman](http://benalman.com)
 
-*This file was generated on Mon Aug 24 2015 10:50:01.*
+*This file was generated on Tue Oct 27 2015 10:41:14.*
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,21 +1,15 @@
 # AppVeyor file
 # http://www.appveyor.com/docs/appveyor-yml
 
-# Build version format
 version: "{build}"
 
 clone_depth: 10
 
-# Fix line endings on Windows
-init:
-  - git config --global core.autocrlf true
-
-# What combinations to test
 environment:
   matrix:
-    - nodejs_version: 1
-    - nodejs_version: 0.12
-    - nodejs_version: 0.10
+    - nodejs_version: "4"
+    - nodejs_version: "0.12"
+    - nodejs_version: "0.10"
 
 install:
   - ps: Install-Product node $env:nodejs_version
@@ -31,5 +25,4 @@ matrix:
   fast_finish: true
 
 cache:
-  - '%APPDATA%\npm-cache -> package.json'       # npm cache
   - 'node_modules -> package.json'              # local npm modules
diff --git a/docs/uglify-examples.md b/docs/uglify-examples.md
@@ -111,7 +111,7 @@ Refer to the [UglifyJS SourceMap Documentation](http://lisperator.net/uglifyjs/c
 ## Turn off console warnings
 
 Specify `drop_console: true` as part of the `compress` options to discard calls to `console.*` functions.
-This will supress warning messages in the console.
+This will suppress warning messages in the console.
 
 ```js
 // Project configuration.

diff --git a/docs/uglify-options.md b/docs/uglify-options.md
@@ -118,44 +118,44 @@ Turn on preservation of comments.
 
 ## banner
 Type: `String`  
-Default: empty string
+Default: `''`
 
 This string will be prepended to the minified output.  Template strings (e.g. `<%= config.value %>` will be expanded automatically.
 
 ## footer
 Type: `String`  
-Default: empty string
+Default: `''`
 
 This string will be appended to the minified output.  Template strings (e.g. `<%= config.value %>` will be expanded automatically.
 
 ## screwIE8
 Type: `Boolean`  
-Default: false
+Default: `false`
 
 Pass this flag if you don't care about full compliance with Internet Explorer 6-8 quirks.
 
 ## mangleProperties
 Type: `Boolean`  
-Default: false
+Default: `false`
 
 Use this flag to turn on object property name mangling.
 
 ## reserveDOMProperties
 Type: `Boolean`  
-Default: false
+Default: `false`
 
 Use this flag in conjunction with `mangleProperties` to prevent built-in browser object properties from being mangled.
 
 ## exceptionsFiles
 Type: `Array`  
-Default: []
+Default: `[]`
 
 Use this with `mangleProperties` to pass one or more JSON files containing a list of variables and object properties
 that should not be mangled. See the [UglifyJS docs](https://www.npmjs.com/package/uglify-js) for more info on the file syntax.
 
 ## nameCache
 Type: `String`  
-Default: empty string
+Default: `''`
 
 A string that is a path to a JSON cache file that uglify will create and use to coordinate symbol mangling between
 multiple runs of uglify. Note: this generated file uses the same JSON format as the `exceptionsFiles` files.

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-contrib-uglify",
   "description": "Minify files with UglifyJS",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "author": {
     "name": "Grunt Team",
     "url": "http://gruntjs.com/"
@@ -18,8 +18,8 @@
     "chalk": "^1.0.0",
     "lodash": "^3.2.0",
     "maxmin": "^1.0.0",
-    "uglify-js": "^2.4.24",
-    "uri-path": "0.0.2"
+    "uglify-js": "^2.5.0",
+    "uri-path": "^1.0.0"
   },
   "devDependencies": {
     "grunt": "^0.4.2",

diff --git a/tasks/lib/uglify.js b/tasks/lib/uglify.js
@@ -197,21 +197,6 @@ exports.init = function(grunt) {
       source_map: null
     };
 
-    if (options.preserveComments) {
-      if (options.preserveComments === 'all' || options.preserveComments === true) {
-
-        // preserve all the comments we can
-        outputOptions.comments = true;
-      } else if (options.preserveComments === 'some') {
-        // preserve comments with directives or that start with a bang (!)
-        outputOptions.comments = /^!|@preserve|@license|@cc_on/i;
-      } else if (_.isFunction(options.preserveComments)) {
-
-        // support custom functions passed in
-        outputOptions.comments = options.preserveComments;
-      }
-    }
-
     if (options.banner && options.sourceMap) {
       outputOptions.preamble = options.banner;
     }
@@ -269,6 +254,10 @@ exports.init = function(grunt) {
       outputOptions.quote_style = options.quoteStyle;
     }
 
+    if (!_.isUndefined(options.preserveComments)) {
+      outputOptions.comments = options.preserveComments;
+    }
+
     return outputOptions;
   };
 

diff --git a/test/fixtures/expected/deep/directory/location/source_map.js.map b/test/fixtures/expected/deep/directory/location/source_map.js.map
diff --git a/test/fixtures/expected/exportAll.js b/test/fixtures/expected/exportAll.js
diff --git a/test/fixtures/expected/source_map_custom_name b/test/fixtures/expected/source_map_custom_name
@@ -1 +1 @@
-{"version":3,"file":"sourcemap_customName.js","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"}
+{"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"}
diff --git a/test/fixtures/expected/sourcemap_basic.js.map b/test/fixtures/expected/sourcemap_basic.js.map
diff --git a/test/fixtures/expected/sourcemap_customRoot.js.map b/test/fixtures/expected/sourcemap_customRoot.js.map
diff --git a/test/fixtures/expected/sourcemap_functionName.js.fn.map b/test/fixtures/expected/sourcemap_functionName.js.fn.map
diff --git a/test/fixtures/expected/sourcemap_sources.js.map b/test/fixtures/expected/sourcemap_sources.js.map
diff --git a/test/fixtures/expected/sourcemapin.js.map b/test/fixtures/expected/sourcemapin.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":3,"file":"sourcemap_customName.js","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"}
		{"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"}