html-webpack-plugin 5.5.1 → 5.5.3

package/README.md

@@ -1,13 +1,12 @@
 [![npm][npm]][npm-url]
 [![node][node]][node-url]
 ![npm](https://img.shields.io/npm/dw/html-webpack-plugin.svg)
-[![deps][deps]][deps-url]
 [![tests][tests]][tests-url]
 [![Backers on Open Collective](https://opencollective.com/html-webpack-plugin/backers/badge.svg)](#backers)
  [![Sponsors on Open Collective](https://opencollective.com/html-webpack-plugin/sponsors/badge.svg)](#sponsors) 
 
 <div align="center">
-  <img width="200" height="200" src="https://worldvectorlogo.com/logos/html5.svg">
+  <img width="200" height="200" src="https://www.w3.org/html/logo/downloads/HTML5_Badge.svg">
   <a href="https://github.com/webpack/webpack">
     <img width="200" height="200"
       src="https://webpack.js.org/assets/icon-square-big.svg">
@@ -90,6 +89,7 @@ The `html-webpack-plugin` provides [hooks](https://github.com/jantimon/html-webp
   * [html-webpack-skip-assets-plugin](https://github.com/swimmadude66/html-webpack-skip-assets-plugin) Skip adding certain output files to the html file. Built as a drop-in replacement for [html-webpack-exclude-assets-plugin](https://www.npmjs.com/package/html-webpack-exclude-assets-plugin) and works with newer [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) versions
  * [html-webpack-inject-preload](https://github.com/principalstudio/html-webpack-inject-preload) allows to add preload links &lt;link rel='preload'> anywhere you want.
  * [inject-body-webpack-plugin](https://github.com/Jaid/inject-body-webpack-plugin) is a simple method of injecting a custom HTML string into the body.
+ * [html-webpack-plugin-django](https://github.com/TommasoAmici/html-webpack-plugin-django) a Webpack plugin to inject Django static tags.
 
 
 <h2 align="center">Usage</h2>
@@ -661,8 +661,5 @@ This project uses the [semistandard code style](https://github.com/Flet/semistan
 [node]: https://img.shields.io/node/v/html-webpack-plugin.svg
 [node-url]: https://nodejs.org
 
-[deps]: https://david-dm.org/jantimon/html-webpack-plugin.svg
-[deps-url]: https://david-dm.org/jantimon/html-webpack-plugin
-
 [tests]: https://github.com/jantimon/html-webpack-plugin/workflows/CI/badge.svg
 [tests-url]: https://github.com/jantimon/html-webpack-plugin/actions?query=workflow%3ACI

package/index.js

@@ -76,7 +76,8 @@ class HtmlWebpackPlugin {
       // Default metaOptions if no template is provided
       if (!userOptions.template && options.templateContent === false && options.meta) {
         const defaultMeta = {
-        // From https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag
+          // TODO remove in the next major release
+          // From https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag
           viewport: 'width=device-width, initial-scale=1'
         };
         options.meta = Object.assign({}, options.meta, defaultMeta, userOptions.meta);
@@ -132,8 +133,56 @@ class HtmlWebpackPlugin {
       HTML_WEBPACK_PLUGIN: true,
       require: require,
       htmlWebpackPluginPublicPath: publicPath,
-      URL: require('url').URL,
-      __filename: templateWithoutLoaders
+      __filename: templateWithoutLoaders,
+      __dirname: path.dirname(templateWithoutLoaders),
+      AbortController: global.AbortController,
+      AbortSignal: global.AbortSignal,
+      Blob: global.Blob,
+      Buffer: global.Buffer,
+      ByteLengthQueuingStrategy: global.ByteLengthQueuingStrategy,
+      BroadcastChannel: global.BroadcastChannel,
+      CompressionStream: global.CompressionStream,
+      CountQueuingStrategy: global.CountQueuingStrategy,
+      Crypto: global.Crypto,
+      CryptoKey: global.CryptoKey,
+      CustomEvent: global.CustomEvent,
+      DecompressionStream: global.DecompressionStream,
+      Event: global.Event,
+      EventTarget: global.EventTarget,
+      File: global.File,
+      FormData: global.FormData,
+      Headers: global.Headers,
+      MessageChannel: global.MessageChannel,
+      MessageEvent: global.MessageEvent,
+      MessagePort: global.MessagePort,
+      PerformanceEntry: global.PerformanceEntry,
+      PerformanceMark: global.PerformanceMark,
+      PerformanceMeasure: global.PerformanceMeasure,
+      PerformanceObserver: global.PerformanceObserver,
+      PerformanceObserverEntryList: global.PerformanceObserverEntryList,
+      PerformanceResourceTiming: global.PerformanceResourceTiming,
+      ReadableByteStreamController: global.ReadableByteStreamController,
+      ReadableStream: global.ReadableStream,
+      ReadableStreamBYOBReader: global.ReadableStreamBYOBReader,
+      ReadableStreamBYOBRequest: global.ReadableStreamBYOBRequest,
+      ReadableStreamDefaultController: global.ReadableStreamDefaultController,
+      ReadableStreamDefaultReader: global.ReadableStreamDefaultReader,
+      Response: global.Response,
+      Request: global.Request,
+      SubtleCrypto: global.SubtleCrypto,
+      DOMException: global.DOMException,
+      TextDecoder: global.TextDecoder,
+      TextDecoderStream: global.TextDecoderStream,
+      TextEncoder: global.TextEncoder,
+      TextEncoderStream: global.TextEncoderStream,
+      TransformStream: global.TransformStream,
+      TransformStreamDefaultController: global.TransformStreamDefaultController,
+      URL: global.URL,
+      URLSearchParams: global.URLSearchParams,
+      WebAssembly: global.WebAssembly,
+      WritableStream: global.WritableStream,
+      WritableStreamDefaultController: global.WritableStreamDefaultController,
+      WritableStreamDefaultWriter: global.WritableStreamDefaultWriter
     });
     const vmScript = new vm.Script(source, { filename: templateWithoutLoaders });
     // Evaluate code and cast to string
@@ -664,10 +713,7 @@ function hookIntoCompiler (compiler, options, plugin) {
       const entryPointUnfilteredFiles = compilation.entrypoints.get(entryName).getFiles();
 
       const entryPointFiles = entryPointUnfilteredFiles.filter((chunkFile) => {
-        // compilation.getAsset was introduced in webpack 4.4.0
-        // once the support pre webpack 4.4.0 is dropped please
-        // remove the following guard:
-        const asset = compilation.getAsset && compilation.getAsset(chunkFile);
+        const asset = compilation.getAsset(chunkFile);
         if (!asset) {
           return true;
         }
@@ -921,8 +967,15 @@ function hookIntoCompiler (compiler, options, plugin) {
     const htmlRegExp = /(<html[^>]*>)/i;
     const headRegExp = /(<\/head\s*>)/i;
     const bodyRegExp = /(<\/body\s*>)/i;
+    const metaViewportRegExp = /<meta[^>]+name=["']viewport["'][^>]*>/i;
     const body = assetTags.bodyTags.map((assetTagObject) => htmlTagObjectToString(assetTagObject, options.xhtml));
-    const head = assetTags.headTags.map((assetTagObject) => htmlTagObjectToString(assetTagObject, options.xhtml));
+    const head = assetTags.headTags.filter((item) => {
+      if (item.tagName === 'meta' && item.attributes && item.attributes.name === 'viewport' && metaViewportRegExp.test(html)) {
+        return false;
+      }
+
+      return true;
+    }).map((assetTagObject) => htmlTagObjectToString(assetTagObject, options.xhtml));
 
     if (body.length) {
       if (bodyRegExp.test(html)) {

package/lib/child-compiler.js

@@ -3,6 +3,7 @@
 /** @typedef {import("webpack/lib/Compiler.js")} WebpackCompiler */
 /** @typedef {import("webpack/lib/Chunk.js")} WebpackChunk */
 'use strict';
+
 /**
  * @file
  * This file uses webpack to compile a template with a child compiler.
@@ -10,7 +11,6 @@
  * [TEMPLATE] -> [JAVASCRIPT]
  *
  */
-'use strict';
 
 let instanceId = 0;
 /**

package/lib/loader.js

@@ -23,16 +23,16 @@ module.exports = function (source) {
   }
 
   // Skip .js files (unless it's explicitly enforced)
-  if (/\.js$/.test(this.resourcePath) && !force) {
+  if (/\.(c|m)?js$/.test(this.resourcePath) && !force) {
     return source;
   }
 
   // The following part renders the template with lodash as a minimalistic loader
   //
   const template = _.template(source, { interpolate: /<%=([\s\S]+?)%>/g, variable: 'data', ...options });
-  // Use __non_webpack_require__ to enforce using the native nodejs require
+  // Use `eval("require")("lodash")` to enforce using the native nodejs require
   // during template execution
-  return 'var _ = __non_webpack_require__(' + JSON.stringify(require.resolve('lodash')) + ');' +
+  return 'var _ = eval("require")(' + JSON.stringify(require.resolve('lodash')) + ');' +
     'module.exports = function (templateParams) { with(templateParams) {' +
       // Execute the lodash template
       'return (' + template.source + ')();' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-webpack-plugin",
-  "version": "5.5.1",
+  "version": "5.5.3",
   "license": "MIT",
   "description": "Simplifies creation of HTML files to serve your webpack bundles",
   "author": "Jan Nicklas <j.nicklas@me.com> (https://github.com/jantimon)",
@@ -28,7 +28,7 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "11.13.9",
+    "@types/node": "^20.2.5",
     "commitizen": "^4.2.4",
     "css-loader": "5.0.1",
     "cz-conventional-changelog": "2.1.0",
@@ -44,7 +44,7 @@
     "standard-version": "^9.3.0",
     "style-loader": "2.0.0",
     "typescript": "4.9.4",
-    "webpack": "^5.79.0",
+    "webpack": "^5.86.0",
     "webpack-cli": "4.5.0",
     "webpack-recompilation-simulator": "3.2.0"
   },

package/typings.d.ts

@@ -52,6 +52,8 @@ declare namespace HtmlWebpackPlugin {
      */
     chunksSortMode?:
       | "auto"
+      // `none` is deprecated and an alias for `auto` now.
+      | "none"
       | "manual"
       | ((entryNameA: string, entryNameB: string) => number);
     /**