html-webpack-plugin 5.6.3 → 5.6.5

package/index.js

@@ -632,62 +632,23 @@ class HtmlWebpackPlugin {
     const templateWithoutLoaders = templateFilename
       .replace(/^.+!/, "")
       .replace(/\?.+$/, "");
-    const vmContext = vm.createContext({
-      ...global,
-      HTML_WEBPACK_PLUGIN: true,
-      require: require,
-      htmlWebpackPluginPublicPath: publicPath,
-      __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 globalClone = Object.create(
+      Object.getPrototypeOf(global),
+      Object.getOwnPropertyDescriptors(global),
+    );
+    // Presence of `eval` breaks template's explicit `eval` call, might be a bug in Node
+    delete globalClone.eval;
+    // Not using `...global` as it throws when localStorage is not explicitly enabled in Node 25+
+    const vmContext = vm.createContext(
+      Object.assign(globalClone, {
+        HTML_WEBPACK_PLUGIN: true,
+        // Copying nonstandard globals like `require` explicitly as they may be absent from `global`
+        require: require,
+        htmlWebpackPluginPublicPath: publicPath,
+        __filename: templateWithoutLoaders,
+        __dirname: path.dirname(templateWithoutLoaders),
+      }),
+    );
 
     const vmScript = new vm.Script(source, {
       filename: templateWithoutLoaders,
@@ -1307,7 +1268,9 @@ class HtmlWebpackPlugin {
 
     if ("error" in templateResult) {
       compilation.errors.push(
-        prettyError(templateResult.error, compiler.context).toString(),
+        new Error(
+          prettyError(templateResult.error, compiler.context).toString(),
+        ),
       );
     }
 
@@ -1497,7 +1460,9 @@ class HtmlWebpackPlugin {
       .catch((err) => {
         // In case anything went wrong the promise is resolved
         // with the error message and an error is logged
-        compilation.errors.push(prettyError(err, compiler.context).toString());
+        compilation.errors.push(
+          new Error(prettyError(err, compiler.context).toString()),
+        );
         return this.options.showErrors
           ? prettyError(err, compiler.context).toHtml()
           : "ERROR";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-webpack-plugin",
-  "version": "5.6.3",
+  "version": "5.6.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)",
@@ -58,7 +58,7 @@
     "standard-version": "^9.3.0",
     "style-loader": "2.0.0",
     "typescript": "4.9.4",
-    "webpack": "^5.95.0",
+    "webpack": "^5.101.0",
     "webpack-cli": "4.5.0",
     "webpack-recompilation-simulator": "3.2.0"
   },