Version 3.x

.node-version

@@ -0,0 +1 @@
+4.3.2

.travis.yml

@@ -1,15 +1,15 @@
 language: node_js
 node_js:
-  - "0.12"
-  - "0.10"
   - "4"
   - "5"
   - "6"
 env:
   - WEBPACK=webpack
+before_install:
+  - stty columns 120
 install:
   - npm install --ignore-scripts
   - npm rm webpack
   - npm install $WEBPACK --ignore-scripts || true
 script:
-  - npm test
+  - npm test

CHANGELOG.md

@@ -1,6 +1,13 @@
 Change History
 ==============
 
+v3.x
+---
+* Rename `closingTag` into `voidTag` like in the official w3c spec.
+* Provide a `createHtmlTagObject` helper for plugin authors to create new tags.
+* Remove build in html minification
+* Support same node version like webpack 2: node 4 and higher
+
 v2.26.0
 ---
 * Allow plugins to add attributes without values to the `<script>` and `<link>` tags

README.md

@@ -1,6 +1,6 @@
 HTML Webpack Plugin
 ===================
-[![npm version](https://badge.fury.io/js/html-webpack-plugin.svg)](http://badge.fury.io/js/html-webpack-plugin) [![Dependency Status](https://david-dm.org/ampedandwired/html-webpack-plugin.svg)](https://david-dm.org/ampedandwired/html-webpack-plugin) [![Build status](https://travis-ci.org/ampedandwired/html-webpack-plugin.svg)](https://travis-ci.org/ampedandwired/html-webpack-plugin) [![Windows build status](https://ci.appveyor.com/api/projects/status/github/ampedandwired/html-webpack-plugin?svg=true&branch=master)](https://ci.appveyor.com/project/jantimon/html-webpack-plugin) [![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/Flet/semistandard) [![bitHound Dependencies](https://www.bithound.io/github/ampedandwired/html-webpack-plugin/badges/dependencies.svg)](https://www.bithound.io/github/ampedandwired/html-webpack-plugin/master/dependencies/npm) [![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)]()
+[![npm version](https://badge.fury.io/js/html-webpack-plugin.svg)](http://badge.fury.io/js/html-webpack-plugin) [![Dependency Status](https://david-dm.org/jantimon/html-webpack-plugin.svg)](https://david-dm.org/jantimon/html-webpack-plugin) [![Build status](https://travis-ci.org/jantimon/html-webpack-plugin.svg)](https://travis-ci.org/jantimon/html-webpack-plugin) [![Windows build status](https://ci.appveyor.com/api/projects/status/github/jantimon/html-webpack-plugin?svg=true&branch=master)](https://ci.appveyor.com/project/jantimon/html-webpack-plugin) [![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/Flet/semistandard) [![bitHound Dependencies](https://www.bithound.io/github/jantimon/html-webpack-plugin/badges/dependencies.svg)](https://www.bithound.io/github/jantimon/html-webpack-plugin/master/dependencies/npm) [![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)]()
 
 [![NPM](https://nodei.co/npm/html-webpack-plugin.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/html-webpack-plugin/)
 
@@ -21,7 +21,7 @@ $ npm install html-webpack-plugin --save-dev
 Third party addons:
 -------------
 
-The html-webpack-plugin provides [hooks](https://github.com/ampedandwired/html-webpack-plugin#events) to extend it to your needs.
+The html-webpack-plugin provides [hooks](https://github.com/jantimon/html-webpack-plugin#events) to extend it to your needs.
 There are already some really powerful plugins which can be integrated with zero configuration:
 
  * [webpack-subresource-integrity](https://www.npmjs.com/package/webpack-subresource-integrity) for enhanced asset security
@@ -30,7 +30,11 @@ There are already some really powerful plugins which can be integrated with zero
  * [html-webpack-harddisk-plugin](https://github.com/jantimon/html-webpack-harddisk-plugin)
  * [html-webpack-inline-source-plugin](https://github.com/DustinJackson/html-webpack-inline-source-plugin) to inline your assets in the resulting HTML file
  * [html-webpack-exclude-assets-plugin](https://github.com/jamesjieye/html-webpack-exclude-assets-plugin) for excluding assets using regular expressions
-
+ * [html-webpack-include-assets-plugin](https://github.com/jharris4/html-webpack-include-assets-plugin) for including lists of js or css file paths (such as those copied by the copy-webpack-plugin).
+ * [script-ext-html-webpack-plugin](https://github.com/numical/script-ext-html-webpack-plugin) to add `async`, `defer` or `module` attributes to your`<script>` elements, or even in-line them
+ * [style-ext-html-webpack-plugin](https://github.com/numical/style-ext-html-webpack-plugin) to convert your `<link>`s to external stylesheets into `<style>` elements containing internal CSS
+ * [resource-hints-webpack-plugin](https://github.com/jantimon/resource-hints-webpack-plugin) to add resource hints for faster initial page loads
+
 Basic Usage
 -----------
 
@@ -55,7 +59,7 @@ This will generate a file `dist/index.html` containing the following:
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>Webpack App</title>
   </head>
   <body>
@@ -79,10 +83,9 @@ Allowed values are as follows:
 - `title`: The title to use for the generated HTML document.
 - `filename`: The file to write the HTML to. Defaults to `index.html`.
    You can specify a subdirectory here too (eg: `assets/admin.html`).
-- `template`: Webpack require path to the template. Please see the [docs](https://github.com/ampedandwired/html-webpack-plugin/blob/master/docs/template-option.md) for details. 
+- `template`: Webpack require path to the template. Please see the [docs](https://github.com/jantimon/html-webpack-plugin/blob/master/docs/template-option.md) for details.
 - `inject`: `true | 'head' | 'body' | false` Inject all assets into the given `template` or `templateContent` - When passing `true` or `'body'` all javascript resources will be placed at the bottom of the body element. `'head'` will place the scripts in the head element.
 - `favicon`: Adds the given favicon path to the output html.
-- `minify`: `{...} | false` Pass a [html-minifier](https://github.com/kangax/html-minifier#options-quick-reference) options object to minify the output.
 - `hash`: `true | false` if `true` then append a unique webpack compilation hash to all
   included scripts and CSS files. This is useful for cache busting.
 - `cache`: `true | false` if `true` (default) try to emit the file only if it was changed.
@@ -112,9 +115,9 @@ Here's an example webpack config illustrating how to use these options:
 FAQ
 ----
 
-* [Why is my HTML minified?](https://github.com/ampedandwired/html-webpack-plugin/blob/master/docs/template-option.md)
-* [Why is my `<% ... %>` template not working?](https://github.com/ampedandwired/html-webpack-plugin/blob/master/docs/template-option.md)
-* [How can I use handlebars/pug/ejs as template engine](https://github.com/ampedandwired/html-webpack-plugin/blob/master/docs/template-option.md)
+* [Why is my HTML minified?](https://github.com/jantimon/html-webpack-plugin/blob/master/docs/template-option.md)
+* [Why is my `<% ... %>` template not working?](https://github.com/jantimon/html-webpack-plugin/blob/master/docs/template-option.md)
+* [How can I use handlebars/pug/ejs as template engine](https://github.com/jantimon/html-webpack-plugin/blob/master/docs/template-option.md)
 
 Generating Multiple HTML Files
 ------------------------------
@@ -159,7 +162,7 @@ plugins: [
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <meta charset="utf-8"/>
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>
@@ -305,9 +308,12 @@ Note that the callback must be passed the htmlPluginData in order to pass this o
 
 # Contribution
 
-You're free to contribute to this project by submitting [issues](https://github.com/ampedandwired/html-webpack-plugin/issues) and/or [pull requests](https://github.com/ampedandwired/html-webpack-plugin/pulls). This project is test-driven, so keep in mind that every change and new feature should be covered by tests.
+You're free to contribute to this project by submitting [issues](https://github.com/jantimon/html-webpack-plugin/issues) and/or [pull requests](https://github.com/jantimon/html-webpack-plugin/pulls). This project is test-driven, so keep in mind that every change and new feature should be covered by tests.
 This project uses the [semistandard code style](https://github.com/Flet/semistandard).
+This plugin follows the webpack teams decision to support [node 4+](http://node.green/).
+
+Before running the tests, make sure to execute `yarn link` and `yarn link html-webpack-plugin` (or the npm variant of this).
 
 # License
 
-This project is licensed under [MIT](https://github.com/ampedandwired/html-webpack-plugin/blob/master/LICENSE).
+This project is licensed under [MIT](https://github.com/jantimon/html-webpack-plugin/blob/master/LICENSE).

default_index.ejs

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>

examples/appcache/dist/webpack-1/index.html

@@ -1 +1,11 @@
-<!doctype html><html lang="en" manifest="manifest.appcache"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
+<!doctype html>
+<html lang="en" manifest="manifest.appcache">
+<head>
+  <meta charset="utf-8">
+  <title>Example template</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+<link href="styles.css" rel="stylesheet"></head>
+<body>
+  <img src="0714810ae3fb211173e2964249507195.png">
+<script src="bundle.js"></script></body>
+</html>

examples/appcache/dist/webpack-2/index.html

@@ -1 +1,11 @@
-<!doctype html><html lang="en" manifest="manifest.appcache"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
+<!doctype html>
+<html lang="en" manifest="manifest.appcache">
+<head>
+  <meta charset="utf-8">
+  <title>Example template</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+<link href="styles.css" rel="stylesheet"></head>
+<body>
+  <img src="0714810ae3fb211173e2964249507195.png">
+<script src="bundle.js"></script></body>
+</html>

examples/appcache/webpack.config.js

@@ -22,11 +22,7 @@ module.exports = {
     new AppCachePlugin(),
     new HtmlWebpackPlugin({
       filename: 'index.html',
-      template: 'template.html',
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true
-      }
+      template: 'template.html'
     }),
     new ExtractTextPlugin('styles.css')
   ]

examples/custom-template/dist/webpack-1/index.html

@@ -8,5 +8,5 @@
 <body>
   <h2>Partial</h2>
 <img src="0714810ae3fb211173e2964249507195.png">
-<script type="text/javascript" src="bundle.js"></script></body>
+<script src="bundle.js"></script></body>
 </html>

examples/custom-template/dist/webpack-2/index.html

@@ -8,5 +8,5 @@
 <body>
   <h2>Partial</h2>
 <img src="0714810ae3fb211173e2964249507195.png">
-<script type="text/javascript" src="bundle.js"></script></body>
+<script src="bundle.js"></script></body>
 </html>

examples/default/dist/webpack-1/index.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>Webpack App</title>
   </head>
   <body>
-  <script type="text/javascript" src="bundle.js"></script></body>
+  <script src="bundle.js"></script></body>
 </html>

examples/default/dist/webpack-2/index.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>Webpack App</title>
   </head>
   <body>
-  <script type="text/javascript" src="bundle.js"></script></body>
+  <script src="bundle.js"></script></body>
 </html>

examples/favicon/dist/webpack-1/favicon.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>HtmlWebpackPlugin example</title>
   <link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head>
   <body>
-  <script type="text/javascript" src="bundle.js"></script></body>
+  <script src="bundle.js"></script></body>
 </html>

examples/favicon/dist/webpack-2/favicon.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>HtmlWebpackPlugin example</title>
   <link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head>
   <body>
-  <script type="text/javascript" src="bundle.js"></script></body>
+  <script src="bundle.js"></script></body>
 </html>

examples/html-loader/dist/webpack-1/about.html

@@ -7,5 +7,5 @@
 <link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head>
 <body>
   <img src="0714810ae3fb211173e2964249507195.png">
-<script type="text/javascript" src="bundle.js"></script></body>
+<script src="bundle.js"></script></body>
 </html>

examples/html-loader/dist/webpack-1/index.html

@@ -7,5 +7,5 @@
 <link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head>
 <body>
   <img src="0714810ae3fb211173e2964249507195.png">
-<script type="text/javascript" src="bundle.js"></script></body>
+<script src="bundle.js"></script></body>
 </html>

examples/html-loader/dist/webpack-2/about.html

@@ -7,5 +7,5 @@
 <link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head>
 <body>
   <img src="0714810ae3fb211173e2964249507195.png">
-<script type="text/javascript" src="bundle.js"></script></body>
+<script src="bundle.js"></script></body>
 </html>

examples/html-loader/dist/webpack-2/index.html

@@ -7,5 +7,5 @@
 <link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head>
 <body>
   <img src="0714810ae3fb211173e2964249507195.png">
-<script type="text/javascript" src="bundle.js"></script></body>
+<script src="bundle.js"></script></body>
 </html>

examples/inline/dist/webpack-1/index.html

@@ -1,6 +1,6 @@
-<!DOCTYPE html><html><head><meta http-equiv="Content-type" content="text/html; charset=utf-8"><title>Jade demo</title></head><body><style>body {
+<!DOCTYPE html><html><head><meta charset="utf-8"><title>Jade demo</title></head><body><style>body {
   background: snow;
-}</style><script type="text/javascript">/******/ (function(modules) { // webpackBootstrap
+}</style><script>/******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
 

examples/inline/dist/webpack-2/index.html

@@ -1,6 +1,6 @@
-<!DOCTYPE html><html><head><meta http-equiv="Content-type" content="text/html; charset=utf-8"><title>Jade demo</title></head><body><style>body {
+<!DOCTYPE html><html><head><meta charset="utf-8"><title>Jade demo</title></head><body><style>body {
   background: snow;
-}</style><script type="text/javascript">/******/ (function(modules) { // webpackBootstrap
+}</style><script>/******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
 

examples/inline/template.jade

@@ -1,10 +1,10 @@
 doctype html
 html
   head
-    meta(http-equiv="Content-type" content="text/html; charset=utf-8")
+    meta(charset="utf-8")
     title #{htmlWebpackPlugin.options.title}
   body
     each cssFile in htmlWebpackPlugin.files.css
       style !{compilation.assets[cssFile.substr(htmlWebpackPlugin.files.publicPath.length)].source()}
     each jsFile in htmlWebpackPlugin.files.js
-      script(type="text/javascript") !{compilation.assets[jsFile.substr(htmlWebpackPlugin.files.publicPath.length)].source()}
+      script !{compilation.assets[jsFile.substr(htmlWebpackPlugin.files.publicPath.length)].source()}

examples/jade-loader/dist/webpack-1/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><title>Jade demo</title><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><!-- this partial is used for frontend and backend--><div class="time"> <b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="0714810ae3fb211173e2964249507195.png"></div><script type="text/javascript" src="bundle.js"></script></body></html>
+<!DOCTYPE html><html><head><title>Jade demo</title><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><!-- this partial is used for frontend and backend--><div class="time"> <b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="0714810ae3fb211173e2964249507195.png"></div><script src="bundle.js"></script></body></html>

examples/jade-loader/dist/webpack-2/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><title>Jade demo</title><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><!-- this partial is used for frontend and backend--><div class="time"> <b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="0714810ae3fb211173e2964249507195.png"></div><script type="text/javascript" src="bundle.js"></script></body></html>
+<!DOCTYPE html><html><head><title>Jade demo</title><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><!-- this partial is used for frontend and backend--><div class="time"> <b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="0714810ae3fb211173e2964249507195.png"></div><script src="bundle.js"></script></body></html>

examples/javascript-advanced/dist/webpack-1/index.html

@@ -1,2 +1,2 @@
 <html><head><title>Webpack App</title><link href="styles.css" rel="stylesheet"></head><body>Hello World from backend - <h2>Partial</h2>
-<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
+<img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>

examples/javascript-advanced/dist/webpack-2/index.html

@@ -1,2 +1,2 @@
 <html><head><title>Webpack App</title><link href="styles.css" rel="stylesheet"></head><body>Hello World from backend - <h2>Partial</h2>
-<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
+<img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>

examples/javascript/dist/webpack-1/index.html

@@ -1,2 +1,2 @@
 <head><link href="styles.css" rel="stylesheet"></head>Hello World from backend2016-10-29T07:02:05.646Z<h2>Partial</h2>
-<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script>
+<img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script>

examples/javascript/dist/webpack-2/index.html

@@ -1,2 +1,2 @@
 <head><link href="styles.css" rel="stylesheet"></head>Hello World from backend2016-07-02T10:27:15.263Z<h2>Partial</h2>
-<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script>
+<img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script>