fix: external resolve callback

Author: alexander-akait

declarations/WebpackOptions.d.ts

@@ -3175,7 +3175,11 @@ export interface ExternalItemFunctionData {
 		| ((
 				context: string,
 				request: string,
-				callback: (err?: Error | null, result?: string | false) => void
+				callback: (
+					err?: Error | null,
+					result?: string | false,
+					resolveRequest?: import("enhanced-resolve").ResolveRequest
+				) => void
 		  ) => void)
 		| ((context: string, request: string) => Promise<string>);
 	/**

schemas/WebpackOptions.json

@@ -1206,7 +1206,7 @@
         "getResolve": {
           "description": "Get a resolve function with the current resolver options.",
           "instanceof": "Function",
-          "tsType": "((options?: ResolveOptions) => ((context: string, request: string, callback: (err?: Error | null, result?: string | false) => void) => void) | ((context: string, request: string) => Promise<string>))"
+          "tsType": "((options?: ResolveOptions) => ((context: string, request: string, callback: (err?: Error | null, result?: string | false, resolveRequest?: import('enhanced-resolve').ResolveRequest) => void) => void) | ((context: string, request: string) => Promise<string>))"
         },
         "request": {
           "description": "The request as written by the user in the require/import expression/statement.",

test/configCases/externals/resolve-callback/webpack.config.js

@@ -18,8 +18,10 @@ module.exports = {
 			if (request === "external-false") {
 				resolve(context, request, callback);
 			} else {
-				resolve(context, request, (err, resolved) => {
+				resolve(context, request, (err, resolved, resolveRequest) => {
 					if (err) callback(err);
+					else if (resolved !== resolveRequest.path)
+						callback(new Error("Error"));
 					else callback(null, `var ${JSON.stringify(resolved)}`);
 				});
 			}

types.d.ts

@@ -4793,7 +4793,11 @@ declare interface ExternalItemFunctionData {
 		| ((
 				context: string,
 				request: string,
-				callback: (err?: null | Error, result?: string | false) => void
+				callback: (
+					err?: null | Error,
+					result?: string | false,
+					resolveRequest?: ResolveRequest
+				) => void
 		  ) => void)
 		| ((context: string, request: string) => Promise<string>);