html-webpack-plugin 2.25.0 → 2.28.0

package/CHANGELOG.md

@@ -1,6 +1,23 @@
 Change History
 ==============
 
+v2.28.0
+---
+* Backport 3.x void tag for plugin authors
+
+v2.27.1
+---
+* Revert 2.25.0 loader resolving
+
+v2.27.0
+---
+* Fix a chunksorter webpack 2 issue (#569)
+* Fix template path resolving(#542)
+
+v2.26.0
+---
+* Allow plugins to add attributes without values to the `<script>` and `<link>` tags
+
 v2.25.0
 ---
 * Clearer loader output

package/README.md

@@ -29,7 +29,11 @@ There are already some really powerful plugins which can be integrated with zero
  * [favicons-webpack-plugin](https://github.com/jantimon/favicons-webpack-plugin) which generates favicons and icons for iOS, Android and desktop browsers
  * [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-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
 -----------
@@ -308,6 +312,8 @@ Note that the callback must be passed the htmlPluginData in order to pass this o
 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.
 This project uses the [semistandard code style](https://github.com/Flet/semistandard).
 
+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).

package/index.js

@@ -233,6 +233,9 @@ HtmlWebpackPlugin.prototype.evaluateCompilationResult = function (compilation, s
   } catch (e) {
     return Promise.reject(e);
   }
+  if (typeof newSource === 'object' && newSource.__esModule && newSource.default) {
+    newSource = newSource.default;
+  }
   return typeof newSource === 'string' || typeof newSource === 'function'
     ? Promise.resolve(newSource)
     : Promise.reject('The loader "' + this.options.template + '" didn\'t return html.');
@@ -581,12 +584,22 @@ HtmlWebpackPlugin.prototype.appendHash = function (url, hash) {
  * Turn a tag definition into a html string
  */
 HtmlWebpackPlugin.prototype.createHtmlTag = function (tagDefinition) {
-  var attributes = Object.keys(tagDefinition.attributes || {}).map(function (attributeName) {
-    return attributeName + '="' + tagDefinition.attributes[attributeName] + '"';
-  });
-  return '<' + [tagDefinition.tagName].concat(attributes).join(' ') + (tagDefinition.selfClosingTag ? '/' : '') + '>' +
+  var attributes = Object.keys(tagDefinition.attributes || {})
+    .filter(function (attributeName) {
+      return tagDefinition.attributes[attributeName] !== false;
+    })
+    .map(function (attributeName) {
+      if (tagDefinition.attributes[attributeName] === true) {
+        return attributeName;
+      }
+      return attributeName + '="' + tagDefinition.attributes[attributeName] + '"';
+    });
+  // Backport of 3.x void tag definition
+  var voidTag = tagDefinition.voidTag !== undefined ? tagDefinition.voidTag : !tagDefinition.closeTag;
+  var selfClosingTag = tagDefinition.voidTag !== undefined ? tagDefinition.voidTag && this.options.xhtml : tagDefinition.selfClosingTag;
+  return '<' + [tagDefinition.tagName].concat(attributes).join(' ') + (selfClosingTag ? '/' : '') + '>' +
     (tagDefinition.innerHTML || '') +
-    (tagDefinition.closeTag ? '</' + tagDefinition.tagName + '>' : '');
+    (voidTag ? '' : '</' + tagDefinition.tagName + '>');
 };
 
 /**
@@ -595,11 +608,11 @@ HtmlWebpackPlugin.prototype.createHtmlTag = function (tagDefinition) {
 HtmlWebpackPlugin.prototype.getFullTemplatePath = function (template, context) {
   // If the template doesn't use a loader use the lodash template loader
   if (template.indexOf('!') === -1) {
-    template = 'html-webpack-plugin/lib/loader.js!' + path.resolve(context, template);
+    template = require.resolve('./lib/loader.js') + '!' + path.resolve(context, template);
   }
   // Resolve template path
   return template.replace(
-    /([!])([^\/\\][^!\?]+|[^\/\\!?])($|\?.+$)/,
+    /([!])([^/\\][^!?]+|[^/\\!?])($|\?[^!?\n]+$)/,
     function (match, prefix, filepath, postfix) {
       return prefix + path.resolve(filepath) + postfix;
     });

package/lib/chunksorter.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var toposort = require('toposort');
+var _ = require('lodash');
 
 /*
   Sorts dependencies between chunks by their "parents" attribute.
@@ -40,7 +41,8 @@ module.exports.dependency = function (chunks) {
     if (chunk.parents) {
       // Add an edge for each parent (parent -> child)
       chunk.parents.forEach(function (parentId) {
-        var parentChunk = nodeMap[parentId];
+        // webpack2 chunk.parents are chunks instead of string id(s)
+        var parentChunk = _.isObject(parentId) ? parentId : nodeMap[parentId];
         // If the parent chunk does not exist (e.g. because of an excluded chunk)
         // we ignore that parent
         if (parentChunk) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-webpack-plugin",
-  "version": "2.25.0",
+  "version": "2.28.0",
   "description": "Simplifies creation of HTML files to serve your webpack bundles",
   "main": "index.js",
   "files": [
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "appcache-webpack-plugin": "^1.3.0",
-    "css-loader": "^0.25.0",
-    "dir-compare": "1.2.0",
+    "css-loader": "^0.26.1",
+    "dir-compare": "1.3.0",
     "es6-promise": "^4.0.5",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
@@ -51,14 +51,14 @@
     "style-loader": "^0.13.1",
     "underscore-template-loader": "^0.7.3",
     "url-loader": "^0.5.7",
-    "webpack": "^1.13.2",
+    "webpack": "^1.14.0",
     "webpack-recompilation-simulator": "^1.3.0"
   },
   "dependencies": {
-    "bluebird": "^3.4.6",
-    "html-minifier": "^3.1.0",
+    "bluebird": "^3.4.7",
+    "html-minifier": "^3.2.3",
     "loader-utils": "^0.2.16",
-    "lodash": "^4.16.4",
+    "lodash": "^4.17.3",
     "pretty-error": "^2.0.2",
     "toposort": "^1.0.0"
   },