From f757c2153bec5bd5398dc476bb26d0bcae37503f Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Wed, 26 Oct 2022 13:02:18 +0200 Subject: [PATCH 1/5] Add NormalModuleReplacementPlugin argument type --- types.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types.d.ts b/types.d.ts index 7bbee39ab75..a54e0a9db7b 100644 --- a/types.d.ts +++ b/types.d.ts @@ -7890,10 +7890,10 @@ declare class NormalModuleReplacementPlugin { */ constructor( resourceRegExp: RegExp, - newResource: string | ((arg0?: any) => void) + newResource: string | ((resource?: { request: string }) => void) ); resourceRegExp: RegExp; - newResource: string | ((arg0?: any) => void); + newResource: string | ((resource?: { request: string }) => void); /** * Apply the plugin From 081e8e4c03c1fc46198fe2aae8fd0c50ff57921a Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Wed, 26 Oct 2022 13:16:38 +0200 Subject: [PATCH 2/5] Update type --- lib/NormalModuleReplacementPlugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/NormalModuleReplacementPlugin.js b/lib/NormalModuleReplacementPlugin.js index 121e8e03399..40c3ec7214c 100644 --- a/lib/NormalModuleReplacementPlugin.js +++ b/lib/NormalModuleReplacementPlugin.js @@ -8,7 +8,7 @@ const { join, dirname } = require("./util/fs"); /** @typedef {import("./Compiler")} Compiler */ -/** @typedef {function(TODO): void} ModuleReplacer */ +/** @typedef {function(resource: { request: string }): void} ModuleReplacer */ class NormalModuleReplacementPlugin { /** From 660df2fa984933b97815d4709428c9ed69335282 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Wed, 26 Oct 2022 13:21:09 +0200 Subject: [PATCH 3/5] Remove name for variable --- lib/NormalModuleReplacementPlugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/NormalModuleReplacementPlugin.js b/lib/NormalModuleReplacementPlugin.js index 40c3ec7214c..47df69452f2 100644 --- a/lib/NormalModuleReplacementPlugin.js +++ b/lib/NormalModuleReplacementPlugin.js @@ -8,7 +8,7 @@ const { join, dirname } = require("./util/fs"); /** @typedef {import("./Compiler")} Compiler */ -/** @typedef {function(resource: { request: string }): void} ModuleReplacer */ +/** @typedef {function({ request: string }): void} ModuleReplacer */ class NormalModuleReplacementPlugin { /** From 1e342b497b8e47a46a0a4d41f0e8e5ffec87d6ce Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Wed, 26 Oct 2022 13:22:12 +0200 Subject: [PATCH 4/5] Fix generated argument name --- types.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types.d.ts b/types.d.ts index a54e0a9db7b..d10da3b0855 100644 --- a/types.d.ts +++ b/types.d.ts @@ -7890,10 +7890,10 @@ declare class NormalModuleReplacementPlugin { */ constructor( resourceRegExp: RegExp, - newResource: string | ((resource?: { request: string }) => void) + newResource: string | ((arg0: { request: string }) => void) ); resourceRegExp: RegExp; - newResource: string | ((resource?: { request: string }) => void); + newResource: string | ((arg0: { request: string }) => void); /** * Apply the plugin From 1b20278fee49d252a1afd5c1b7177fe6e54b8a42 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Thu, 10 Nov 2022 10:48:26 +0100 Subject: [PATCH 5/5] Use full ResolveData type --- lib/NormalModuleReplacementPlugin.js | 2 +- types.d.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/NormalModuleReplacementPlugin.js b/lib/NormalModuleReplacementPlugin.js index 47df69452f2..6b10878670d 100644 --- a/lib/NormalModuleReplacementPlugin.js +++ b/lib/NormalModuleReplacementPlugin.js @@ -8,7 +8,7 @@ const { join, dirname } = require("./util/fs"); /** @typedef {import("./Compiler")} Compiler */ -/** @typedef {function({ request: string }): void} ModuleReplacer */ +/** @typedef {function(import("./NormalModuleFactory").ResolveData): void} ModuleReplacer */ class NormalModuleReplacementPlugin { /** diff --git a/types.d.ts b/types.d.ts index d10da3b0855..bbcb1a2b9fb 100644 --- a/types.d.ts +++ b/types.d.ts @@ -7890,10 +7890,10 @@ declare class NormalModuleReplacementPlugin { */ constructor( resourceRegExp: RegExp, - newResource: string | ((arg0: { request: string }) => void) + newResource: string | ((arg0: ResolveData) => void) ); resourceRegExp: RegExp; - newResource: string | ((arg0: { request: string }) => void); + newResource: string | ((arg0: ResolveData) => void); /** * Apply the plugin