fix: external `resolve` callback
Github Actions / lint (push) Waiting to run Details
Github Actions / basic (push) Waiting to run Details
Github Actions / validate-legacy-node (push) Waiting to run Details
Github Actions / unit (push) Waiting to run Details
Github Actions / integration (10.x, macos-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (10.x, macos-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (10.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (10.x, ubuntu-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (10.x, windows-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (10.x, windows-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (12.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (14.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (16.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (18.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (18.x, ubuntu-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (20.x, macos-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (20.x, macos-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (20.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (20.x, ubuntu-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (20.x, windows-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (20.x, windows-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (22.x, macos-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (22.x, macos-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (22.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (22.x, ubuntu-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (22.x, windows-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (22.x, windows-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (23.x, ubuntu-latest, a) (push) Blocked by required conditions Details
Github Actions / integration (23.x, ubuntu-latest, b) (push) Blocked by required conditions Details
Github Actions / integration (lts/*, ubuntu-latest, a, 1) (push) Blocked by required conditions Details
Github Actions / integration (lts/*, ubuntu-latest, b, 1) (push) Blocked by required conditions Details

This commit is contained in:
alexander-akait 2025-04-03 19:53:27 +03:00
parent e911f5296d
commit 38f9de5084
4 changed files with 14 additions and 4 deletions

View File

@ -3175,7 +3175,11 @@ export interface ExternalItemFunctionData {
| (( | ((
context: string, context: string,
request: 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) ) => void)
| ((context: string, request: string) => Promise<string>); | ((context: string, request: string) => Promise<string>);
/** /**

View File

@ -1206,7 +1206,7 @@
"getResolve": { "getResolve": {
"description": "Get a resolve function with the current resolver options.", "description": "Get a resolve function with the current resolver options.",
"instanceof": "Function", "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": { "request": {
"description": "The request as written by the user in the require/import expression/statement.", "description": "The request as written by the user in the require/import expression/statement.",

View File

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

6
types.d.ts vendored
View File

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