Skip to content

Commit bac1591

Browse files
committed
chore: fixed type issues in _createLoaderContext
1 parent 899f069 commit bac1591

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

lib/NormalModule.js

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,10 @@ class NormalModule extends Module {
648648
/** @type {import("../declarations/LoaderContext").NormalModuleLoaderContext<T>} */
649649
const loaderContext = {
650650
version: 2,
651+
/**
652+
* @param {import("../declarations/LoaderContext").Schema} [schema]
653+
* @returns {T}
654+
*/
651655
getOptions: schema => {
652656
const loader = this.getCurrentLoader(loaderContext);
653657

@@ -721,24 +725,32 @@ class NormalModule extends Module {
721725
},
722726
getResolve(options) {
723727
const child = options ? resolver.withOptions(options) : resolver;
724-
return (context, request, callback) => {
725-
if (callback) {
726-
child.resolve({}, context, request, getResolveContext(), callback);
727-
} else {
728-
return new Promise((resolve, reject) => {
728+
return /** @type {ReturnType<import("../declarations/LoaderContext").NormalModuleLoaderContext<T>["getResolve"]>} */ (
729+
(context, request, callback) => {
730+
if (callback) {
729731
child.resolve(
730732
{},
731733
context,
732734
request,
733735
getResolveContext(),
734-
(err, result) => {
735-
if (err) reject(err);
736-
else resolve(result);
737-
}
736+
callback
738737
);
739-
});
738+
} else {
739+
return new Promise((resolve, reject) => {
740+
child.resolve(
741+
{},
742+
context,
743+
request,
744+
getResolveContext(),
745+
(err, result) => {
746+
if (err) reject(err);
747+
else resolve(result);
748+
}
749+
);
750+
});
751+
}
740752
}
741-
};
753+
);
742754
},
743755
emitFile: (name, content, sourceMap, assetInfo) => {
744756
const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);

0 commit comments

Comments
 (0)