html-webpack-plugin 4.0.0-beta.4 → 4.0.0-beta.5

package/README.md

@@ -205,11 +205,13 @@ your own template. The easiest way is to use the `template` option and pass a cu
 The html-webpack-plugin will automatically inject all necessary CSS, JS, manifest
 and favicon files into the markup.
 
+Details of other template loaders are [documented here](https://github.com/jantimon/html-webpack-plugin/blob/master/docs/template-option.md).
+
 ```js
 plugins: [
   new HtmlWebpackPlugin({
     title: 'Custom template',
-    // Load a custom template (lodash by default see the FAQ for details)
+    // Load a custom template (lodash by default)
     template: 'index.html'
   })
 ]
@@ -354,10 +356,12 @@ To add those use a key/value pair:
 ```js
 plugins: [
   new HtmlWebpackPlugin({
-    'viewport': 'width=device-width, initial-scale=1, shrink-to-fit=no',
-    // Will generate: <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    'theme-color': '#4285f4'
-    // Will generate: <meta name="theme-color" content="#4285f4">
+      'meta': {
+        'viewport': 'width=device-width, initial-scale=1, shrink-to-fit=no',
+        // Will generate: <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        'theme-color': '#4285f4'
+        // Will generate: <meta name="theme-color" content="#4285f4">
+      }
   })
 ]
 ```

package/index.js

@@ -524,21 +524,6 @@ class HtmlWebpackPlugin {
     return assets.js.length && assets.js.every((assetPath) => /\.hot-update\.js$/.test(assetPath));
   }
 
-  /**
-   * Return true if PATH is an absolute url path, otherwise false
-   *
-   * @param {string | undefined} path
-   */
-  isAbsolutePath (path) {
-    if (typeof path === 'undefined' || path === '') return false;
-    // If the path start with '/'
-    if (path.indexOf('/') === 0) return true;
-    // If the path contain the '://' scheme
-    if (path.indexOf('://') !== -1) return true;
-
-    return false;
-  }
-
   /**
    * The htmlWebpackPluginAssets extracts the asset information of a webpack compilation
    * for all given entry names
@@ -557,13 +542,15 @@ class HtmlWebpackPlugin {
 
     /**
      * @type {string} the configured public path to the asset root
-     * if the absolute path publicPath is set in the current webpack config use it otherwise
+     * if a path publicPath is set in the current webpack config use it otherwise
      * fallback to a realtive path
      */
-    let publicPath = this.isAbsolutePath(compilation.options.output.publicPath)
-      // If the absolute path is set in the publicPath use it
-      ? compilation.mainTemplate.getPublicPath({hash: compilationHash})
-      // If publicPath was a relative path get the realtive path
+    const webpackPublicPath = compilation.mainTemplate.getPublicPath({hash: compilationHash});
+    const isPublicPathDefined = webpackPublicPath.trim() !== '';
+    let publicPath = isPublicPathDefined
+      // If a hard coded public path exists use it
+      ? webpackPublicPath
+      // If no public path was set get a relative url path
       : path.relative(path.resolve(compilation.options.output.path, path.dirname(childCompilationOutputName)), compilation.options.output.path)
         .split(path.sep).join('/');
 

package/lib/compiler.js

@@ -119,18 +119,6 @@ class HtmlWebpackChildCompiler {
     new LibraryTemplatePlugin('HTML_WEBPACK_PLUGIN_RESULT', 'var').apply(childCompiler);
     new LoaderTargetPlugin('node').apply(childCompiler);
 
-    // Fix for "Uncaught TypeError: __webpack_require__(...) is not a function"
-    // Hot module replacement requires that every child compiler has its own
-    // cache. @see https://github.com/ampedandwired/html-webpack-plugin/pull/179
-    childCompiler.hooks.compilation.tap('HtmlWebpackPlugin', compilation => {
-      if (compilation.cache) {
-        if (!compilation.cache[compilerName]) {
-          compilation.cache[compilerName] = {};
-        }
-        compilation.cache = compilation.cache[compilerName];
-      }
-    });
-
     // Add all templates
     this.templates.forEach((template, index) => {
       new SingleEntryPlugin(childCompiler.context, template, `HtmlWebpackPlugin_${index}`).apply(childCompiler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-webpack-plugin",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.5",
   "license": "MIT",
   "description": "Simplifies creation of HTML files to serve your webpack bundles",
   "author": "Jan Nicklas <j.nicklas@me.com> (https://github.com/jantimon)",