fix WebpackError handling in Cache

Author: sokra

lib/Cache.js

@@ -6,7 +6,10 @@
 "use strict";
 
 const { AsyncParallelHook, AsyncSeriesBailHook, SyncHook } = require("tapable");
-const { makeWebpackError } = require("./HookWebpackError");
+const {
+	makeWebpackError,
+	makeWebpackErrorCallback
+} = require("./HookWebpackError");
 
 /** @typedef {import("./WebpackError")} WebpackError */
 
@@ -93,7 +96,12 @@ class Cache {
 	 * @returns {void}
 	 */
 	store(identifier, etag, data, callback) {
-		this.hooks.store.callAsync(identifier, etag, data, callback);
+		this.hooks.store.callAsync(
+			identifier,
+			etag,
+			data,
+			makeWebpackErrorCallback(callback, "Cache.hooks.store")
+		);
 	}
 
 	/**
@@ -121,15 +129,19 @@ class Cache {
 	 * @returns {void}
 	 */
 	endIdle(callback) {
-		this.hooks.endIdle.callAsync(callback);
+		this.hooks.endIdle.callAsync(
+			makeWebpackErrorCallback(callback, "Cache.hooks.endIdle")
+		);
 	}
 
 	/**
 	 * @param {Callback<void>} callback signals when the call finishes
 	 * @returns {void}
 	 */
 	shutdown(callback) {
-		this.hooks.shutdown.callAsync(callback);
+		this.hooks.shutdown.callAsync(
+			makeWebpackErrorCallback(callback, "Cache.hooks.shutdown")
+		);
 	}
 }
 

lib/HookWebpackError.js

@@ -9,6 +9,14 @@ const WebpackError = require("./WebpackError");
 
 /** @typedef {import("./Module")} Module */
 
+/**
+ * @template T
+ * @callback Callback
+ * @param {Error=} err
+ * @param {T=} stats
+ * @returns {void}
+ */
+
 class HookWebpackError extends WebpackError {
 	/**
 	 * Creates an instance of HookWebpackError.
@@ -46,7 +54,7 @@ module.exports.makeWebpackError = makeWebpackError;
  * @template T
  * @param {function(WebpackError=, T=): void} callback webpack error callback
  * @param {string} hook name of hook
- * @returns {function(Error=, T=): void} generic callback
+ * @returns {Callback<T>} generic callback
  */
 const makeWebpackErrorCallback = (callback, hook) => {
 	return (err, result) => {