fix: update typing for webpack@^5.94.0 (#110)

* fix: update typing for webpack@^5.94.0

* chore: remove explicit declaration of tapable types

Author: rostislav-simonik

package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.7.0",
+    "tapable": "^2.2.1",
     "tsconfig-paths": "^4.1.2"
   },
   "devDependencies": {
@@ -30,7 +31,7 @@
     "ts-jest": "^27.0.7",
     "ts-loader": "^8.0.18",
     "typescript": "^4.2.3",
-    "webpack": "^5.65.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.5.0"
   },
   "scripts": {

src/plugin.ts

@@ -5,18 +5,19 @@ import * as Options from "./options";
 import * as Logger from "./logger";
 import * as fs from "fs";
 import { ResolvePluginInstance, Resolver } from "webpack";
-import { ResolveRequest, ResolveContext } from "enhanced-resolve";
+import { AsyncSeriesBailHook } from "tapable";
+import { ResolveContext, ResolveRequest } from "enhanced-resolve";
+
+type TapAsyncCallback = Parameters<
+  AsyncSeriesBailHook<
+    [ResolveRequest, ResolveContext],
+    null | ResolveRequest
+  >["tapAsync"]
+>[1];
+
+type TapAsyncInnerCallback = Parameters<TapAsyncCallback>[2];
 
 type FileSystem = Resolver["fileSystem"];
-type TapAsyncCallback = (
-  request: ResolveRequest,
-  context: ResolveContext,
-  callback: TapAsyncInnerCallback
-) => void;
-type TapAsyncInnerCallback = (
-  error?: Error | null | false,
-  result?: null | ResolveRequest
-) => void;
 
 export interface LegacyResolverPlugin {
   readonly apply: (resolver: LegacyResolver) => void;
@@ -28,7 +29,12 @@ export interface LegacyResolver {
   readonly doResolve: doResolveLegacy | doResolve;
   readonly join: (relativePath: string, innerRequest: Request) => Request;
   readonly fileSystem: LegacyResolverFileSystem;
-  readonly getHook: (hook: string) => Tapable;
+  readonly getHook: (
+    hook: string
+  ) => AsyncSeriesBailHook<
+    [ResolveRequest, ResolveContext],
+    null | ResolveRequest
+  >;
 }
 
 export type doResolveLegacy = (
@@ -39,14 +45,20 @@ export type doResolveLegacy = (
 ) => void;
 
 export type doResolve = (
-  hook: Tapable,
+  hook: AsyncSeriesBailHook<
+    [ResolveRequest, ResolveContext],
+    null | ResolveRequest
+  >,
   req: Request,
   message: string,
   resolveContext: LegacyResolveContext,
   callback: Callback
 ) => void;
 
-export type ReadJsonCallback = (error: Error | undefined, result?: {}) => void;
+export type ReadJsonCallback = (
+  error: Error | undefined | null,
+  result?: {}
+) => void;
 
 export type ReadJson = (path2: string, callback: ReadJsonCallback) => void;
 
@@ -58,17 +70,6 @@ export interface LegacyResolveContext {
   missing?: string;
 }
 
-export interface Tapable {
-  readonly tapAsync: (
-    options: TapableOptions,
-    callback: TapAsyncCallback
-  ) => void;
-}
-
-export interface TapableOptions {
-  readonly name: string;
-}
-
 export type ResolverCallbackLegacy = (
   request: Request,
   callback: Callback
@@ -120,7 +121,9 @@ export interface Callback {
 // eslint-disable-next-line no-redeclare
 const getInnerRequest: getInnerRequest = require("enhanced-resolve/lib/getInnerRequest");
 
-export class TsconfigPathsPlugin implements ResolvePluginInstance {
+export class TsconfigPathsPlugin
+  implements Exclude<ResolvePluginInstance, Function>
+{
   source: string = "described-resolve";
   target: string = "resolve";
 
@@ -216,12 +219,12 @@ export class TsconfigPathsPlugin implements ResolvePluginInstance {
         );
     } else if ("plugin" in resolver) {
       // This is the legacy (Webpack < 4.0.0) way of using the plugin system.
-      const legacyResolver = (resolver as unknown) as LegacyResolver;
+      const legacyResolver = resolver as unknown as LegacyResolver;
       legacyResolver.plugin(
         this.source,
         createPluginLegacy(
           this.matchPath,
-          (resolver as unknown) as LegacyResolver,
+          resolver as unknown as LegacyResolver,
           this.absoluteBaseUrl,
           this.target,
           this.extensions
@@ -251,7 +254,10 @@ function createPluginCallback(
   baseMatchPath: TsconfigPaths.MatchPathAsync,
   resolver: Resolver,
   baseAbsoluteBaseUrl: string,
-  hook: Tapable,
+  hook: AsyncSeriesBailHook<
+    [ResolveRequest, ResolveContext],
+    null | ResolveRequest
+  >,
   extensions: ReadonlyArray<string>
 ): TapAsyncCallback {
   const fileExistAsync = createFileExistAsync(resolver.fileSystem);
@@ -420,7 +426,7 @@ function createPluginLegacy(
 }
 
 function readJson(
-  fileSystem: FileSystem,
+  fileSystem: FileSystem | LegacyResolverFileSystem,
   path2: string,
   callback: ReadJsonCallback
 ): void {
@@ -447,7 +453,7 @@ function readJson(
 }
 
 function createReadJsonAsync(
-  filesystem: FileSystem
+  filesystem: FileSystem | LegacyResolverFileSystem
 ): TsconfigPaths.ReadJsonAsync {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return (path2: string, callback2: (err?: Error, content?: any) => void) => {
@@ -463,7 +469,7 @@ function createReadJsonAsync(
 }
 
 function createFileExistAsync(
-  filesystem: FileSystem
+  filesystem: FileSystem | LegacyResolverFileSystem
 ): TsconfigPaths.FileExistsAsync {
   return (
     path2: string,