.travis.yml

@@ -1,6 +1,15 @@
 sudo: false
+
 language: node_js
+
 node_js:
-  - '4'
-  - '0.12'
-  - '0.10'
+  - "6"
+  - "8"
+  - "10"
+
+matrix:
+  fast_finish: true
+
+cache:
+  directories:
+    - node_modules

AUTHORS

@@ -1 +1 @@
-Sindre Sorhus (http://github.com/sindresorhus)
+Sindre Sorhus (https://github.com/sindresorhus)

CHANGELOG

@@ -1,20 +1,71 @@
+v3.0.0:
+  date: 2018-08-26
+  changes:
+    - Updated all dependencies.
+    - Requires Node.js >= 6.
+v2.4.0:
+  date: 2017-05-16
+  changes:
+    - Updated html-minifier to v3.5.0.
+v2.3.0:
+  date: 2017-03-08
+  changes:
+    - Updated html-minifier to v3.4.0.
+v2.2.0:
+  date: 2017-01-30
+  changes:
+    - Updated html-minifier to v3.3.0.
+v2.1.0:
+  date: 2017-01-14
+  changes:
+    - Updated html-minifier to v3.2.3 and pretty-bytes to 4.0.2.
+v2.0.0:
+  date: 2016-07-19
+  changes:
+    - Updated html-minifier to v3.0.1. Note that Node.js < 4 isn't supported anymore.
+v1.5.0:
+  date: 2016-07-13
+  changes:
+    - Updated html-minifier to v2.1.7.
+v1.4.0:
+  date: 2016-04-19
+  changes:
+    - Updated html-minifier to v2.0.0.
+v1.3.0:
+  date: 2016-04-10
+  changes:
+    - Updated html-minifier to v1.5.0.
+v1.2.0:
+  date: 2016-03-31
+  changes:
+    - Updated html-minifier to v1.4.0.
+v1.1.0:
+  date: 2016-03-18
+  changes:
+    - Updated html-minifier to v1.3.0.
+v1.0.0:
+  date: 2016-03-04
+  changes:
+    - Updated html-minifier to v1.2.0.
+    - Point main to task.
+    - Drop peerDeps.
 v0.6.0:
   date: 2015-10-28
   changes:
-    - Updated to `html-minifier` 1.0.0.
+    - Updated html-minifier to v1.0.0.
 v0.5.0:
   date: 2015-09-25
   changes:
-    - Updated to `html-minifier` 0.8.0.
+    - Updated html-minifier to v0.8.0.
 v0.4.0:
   date: 2015-02-06
   changes:
-    - Updated to `html-minifier` 0.7.0.
+    - Updated html-minifier to v0.7.0.
 v0.3.0:
   date: 2014-05-05
   changes:
-    - Drop node.js 0.8 support.
-    - Updated to `html-minifier` 0.6.0.
+    - Drop Node.js 0.8 support.
+    - Updated html-minifier to v0.6.0.
 v0.2.0:
   date: 2014-02-09
   changes:
@@ -26,7 +77,7 @@ v0.1.3:
 v0.1.2:
   date: 2013-04-05
   changes:
-    - Update `html-minifier` which fixes IE conditional comments and prefixed HTML elements `<ng-include>` `<ng:include>`.
+    - Update html-minifier which fixes IE conditional comments and prefixed HTML elements `<ng-include>`, `<ng:include>`.
 v0.1.1:
   date: 2013-02-18
   changes:
@@ -40,7 +91,7 @@ v0.1.1rc5:
   date: 2013-01-09
   changes:
     - Updating to work with grunt v0.4.0rc5.
-    - Switching to this.filesSrc api.
+    - Switching to `this.filesSrc` API.
 v0.1.0:
   date: 2012-11-01
   changes:

CONTRIBUTING.md

@@ -1 +1 @@
-Please see the [Contributing to grunt](http://gruntjs.com/contributing) guide for information on contributing to this project.
+Please see the [Contributing to grunt](https://gruntjs.com/contributing) guide for information on contributing to this project.

LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Sindre Sorhus, contributors
+Copyright (c) 2016 Sindre Sorhus, contributors
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -1,13 +1,12 @@
-# grunt-contrib-htmlmin v0.6.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-htmlmin.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-htmlmin) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/sn73i2qggqeolnc2/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-htmlmin/branch/master)
+# grunt-contrib-htmlmin v3.0.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-htmlmin.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-htmlmin) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/sn73i2qggqeolnc2/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-htmlmin/branch/master)
 
 > Minify HTML
 
 
 
 ## Getting Started
-This plugin requires Grunt `>=0.4.0`
 
-If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
+If you haven't used [Grunt](https://gruntjs.com/) before, be sure to check out the [Getting Started](https://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](https://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
 
 ```shell
 npm install grunt-contrib-htmlmin --save-dev
@@ -31,7 +30,9 @@ _Run this task with the `grunt htmlmin` command._
 
 See the `html-minifier` [options](https://github.com/kangax/html-minifier#options-quick-reference).
 
-#### Example
+### Examples
+
+#### Simple Example
 
 ```js
 grunt.initConfig({
@@ -58,23 +59,64 @@ grunt.initConfig({
 grunt.registerTask('default', ['htmlmin']);
 ```
 
+#### Example with Nested Files
+
+```js
+grunt.initConfig({
+  htmlmin: {                                     // Task
+    dist: {                                      // Target
+      options: {                                 // Target options
+        removeComments: true,
+        collapseWhitespace: true
+      },
+      files: {                                   // Dictionary of files
+        'dist/index.html': 'src/index.html',     // 'destination': 'source'
+        'dist/contact.html': 'src/contact.html'
+      }
+    },
+    dev: {                                       // Another target
+        files: [{
+          expand: true,
+          cwd: 'app',
+          src: ['src/**/*.html', '*.html'],
+          dest: 'dist'
+      }]
+    }
+  }
+});
+
+grunt.registerTask('default', ['htmlmin']);
+```
+
 
 ## Release History
 
- * 2015-10-28   v0.6.0   Updated to `html-minifier` 1.0.0.
- * 2015-09-25   v0.5.0   Updated to `html-minifier` 0.8.0.
- * 2015-02-06   v0.4.0   Updated to `html-minifier` 0.7.0.
- * 2014-05-05   v0.3.0   Drop node.js 0.8 support. Updated to `html-minifier` 0.6.0.
+ * 2018-08-26   v3.0.0   Updated all dependencies. Requires Node.js >= 6.
+ * 2017-05-16   v2.4.0   Updated html-minifier to v3.5.0.
+ * 2017-03-08   v2.3.0   Updated html-minifier to v3.4.0.
+ * 2017-01-30   v2.2.0   Updated html-minifier to v3.3.0.
+ * 2017-01-14   v2.1.0   Updated html-minifier to v3.2.3 and pretty-bytes to 4.0.2.
+ * 2016-07-19   v2.0.0   Updated html-minifier to v3.0.1. Note that Node.js < 4 isn't supported anymore.
+ * 2016-07-13   v1.5.0   Updated html-minifier to v2.1.7.
+ * 2016-04-19   v1.4.0   Updated html-minifier to v2.0.0.
+ * 2016-04-10   v1.3.0   Updated html-minifier to v1.5.0.
+ * 2016-03-31   v1.2.0   Updated html-minifier to v1.4.0.
+ * 2016-03-18   v1.1.0   Updated html-minifier to v1.3.0.
+ * 2016-03-04   v1.0.0   Updated html-minifier to v1.2.0. Point main to task. Drop peerDeps.
+ * 2015-10-28   v0.6.0   Updated html-minifier to v1.0.0.
+ * 2015-09-25   v0.5.0   Updated html-minifier to v0.8.0.
+ * 2015-02-06   v0.4.0   Updated html-minifier to v0.7.0.
+ * 2014-05-05   v0.3.0   Drop Node.js 0.8 support. Updated html-minifier to v0.6.0.
  * 2014-02-09   v0.2.0   Rewrite task. Drop concat support.
  * 2013-04-06   v0.1.3   Fail target when minify encounters an error.
- * 2013-04-05   v0.1.2   Update `html-minifier` which fixes IE conditional comments and prefixed HTML elements `<ng-include>` `<ng:include>`.
+ * 2013-04-05   v0.1.2   Update html-minifier which fixes IE conditional comments and prefixed HTML elements `<ng-include>`, `<ng:include>`.
  * 2013-02-18   v0.1.1   First official release for Grunt 0.4.0.
  * 2013-01-30   v0.1.1rc7   Updating grunt/gruntplugin dependencies to rc7. Changing in-development grunt/gruntplugin dependency versions from tilde version ranges to specific versions.
- * 2013-01-09   v0.1.1rc5   Updating to work with grunt v0.4.0rc5. Switching to this.filesSrc api.
+ * 2013-01-09   v0.1.1rc5   Updating to work with grunt v0.4.0rc5. Switching to `this.filesSrc` API.
  * 2012-11-01   v0.1.0   Initial release.
 
 ---
 
-Task submitted by [Sindre Sorhus](http://github.com/sindresorhus)
+Task submitted by [Sindre Sorhus](https://github.com/sindresorhus)
 
-*This file was generated on Wed Oct 28 2015 01:32:22.*
+*This file was generated on Sun Aug 26 2018 09:25:56.*

appveyor.yml

@@ -1,28 +1,33 @@
-# AppVeyor file
-# http://www.appveyor.com/docs/appveyor-yml
+clone_depth: 10
 
 version: "{build}"
 
-clone_depth: 10
-
+# What combinations to test
 environment:
   matrix:
-    - nodejs_version: "4"
-    - nodejs_version: "0.12"
-    - nodejs_version: "0.10"
+    - nodejs_version: "6"
+      platform: x86
+    - nodejs_version: "8"
+      platform: x86
+    - nodejs_version: "10"
+      platform: x86
 
 install:
-  - ps: Install-Product node $env:nodejs_version
+  - ps: Install-Product node $env:nodejs_version $env:platform
   - npm install
 
-build: off
-
 test_script:
+  # Output useful info for debugging
   - node --version && npm --version
-  - npm test
+  # We test multiple Windows shells because of prior stdout buffering issues
+  # filed against Grunt. https://github.com/joyent/node/issues/3584
+  - ps: "npm test # PowerShell" # Pass comment to PS for easier debugging
+  - cmd: npm test
+
+build: off
 
 matrix:
   fast_finish: true
 
 cache:
-  - 'node_modules -> package.json'              # local npm modules
+  - node_modules -> package.json

docs/htmlmin-examples.md

@@ -1,4 +1,6 @@
-## Example
+# Examples
+
+## Simple Example
 
 ```js
 grunt.initConfig({
@@ -24,3 +26,32 @@ grunt.initConfig({
 
 grunt.registerTask('default', ['htmlmin']);
 ```
+
+## Example with Nested Files
+
+```js
+grunt.initConfig({
+  htmlmin: {                                     // Task
+    dist: {                                      // Target
+      options: {                                 // Target options
+        removeComments: true,
+        collapseWhitespace: true
+      },
+      files: {                                   // Dictionary of files
+        'dist/index.html': 'src/index.html',     // 'destination': 'source'
+        'dist/contact.html': 'src/contact.html'
+      }
+    },
+    dev: {                                       // Another target
+        files: [{
+          expand: true,
+          cwd: 'app',
+          src: ['src/**/*.html', '*.html'],
+          dest: 'dist'
+      }]
+    }
+  }
+});
+
+grunt.registerTask('default', ['htmlmin']);
+```

package.json

@@ -1,34 +1,31 @@
 {
   "name": "grunt-contrib-htmlmin",
   "description": "Minify HTML",
-  "version": "0.6.0",
+  "version": "3.0.0",
   "author": {
     "name": "Grunt Team",
-    "url": "http://gruntjs.com/"
+    "url": "https://gruntjs.com/"
   },
   "repository": "gruntjs/grunt-contrib-htmlmin",
   "license": "MIT",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=6"
   },
+  "main": "tasks/htmlmin.js",
   "scripts": {
     "test": "grunt test"
   },
   "dependencies": {
-    "chalk": "^1.0.0",
-    "html-minifier": "^1.0.0",
-    "pretty-bytes": "^2.0.1"
+    "chalk": "^2.4.1",
+    "html-minifier": "~3.5.20",
+    "pretty-bytes": "^5.1.0"
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-internal": "^0.4.12",
-    "grunt-contrib-jshint": "^0.11.0",
-    "grunt-contrib-nodeunit": "^0.4.1"
-  },
-  "peerDependencies": {
-    "grunt": ">=0.4.0"
+    "grunt": "^1.0.3",
+    "grunt-contrib-clean": "^1.1.0",
+    "grunt-contrib-internal": "^3.1.0",
+    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-nodeunit": "^2.0.0"
   },
   "keywords": [
     "gruntplugin",