Skip to content

Commit ae87dd5

Browse files
committed
Fix type error
1 parent 11172d0 commit ae87dd5

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

packages/react-router/lib/router/router.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5078,12 +5078,16 @@ function loadLazyRoute(
50785078
};
50795079
}
50805080

5081+
function isNonNullable<T>(value: T): value is NonNullable<T> {
5082+
return value !== undefined;
5083+
}
5084+
50815085
function loadLazyMiddlewareForMatches(
50825086
matches: AgnosticDataRouteMatch[],
50835087
manifest: RouteManifest,
50845088
mapRouteProperties: MapRoutePropertiesFunction
50855089
): Promise<void[]> | void {
5086-
let promises = matches
5090+
let promises: Promise<void>[] = matches
50875091
.map(({ route }) => {
50885092
if (typeof route.lazy !== "object" || !route.lazy.unstable_middleware) {
50895093
return undefined;
@@ -5096,7 +5100,7 @@ function loadLazyMiddlewareForMatches(
50965100
mapRouteProperties,
50975101
});
50985102
})
5099-
.filter((p): p is NonNullable<typeof p> => p != null);
5103+
.filter(isNonNullable);
51005104

51015105
return promises.length > 0 ? Promise.all(promises) : undefined;
51025106
}
@@ -5354,8 +5358,8 @@ async function callDataStrategyImpl(
53545358
// it to bubble up from the `await loadRoutePromise` in `callLoaderOrAction` -
53555359
// called from `match.resolve()`. We also ensure that all promises are
53565360
// awaited so that we don't inadvertently leave any hanging promises.
5357-
let allLazyRoutePromises: Array<Promise<void>> = lazyRoutePromises.flatMap(
5358-
(promiseMap) => Object.values(promiseMap).filter((p) => p !== undefined)
5361+
let allLazyRoutePromises: Promise<void>[] = lazyRoutePromises.flatMap(
5362+
(promiseMap) => Object.values(promiseMap).filter(isNonNullable)
53595363
);
53605364
try {
53615365
await Promise.all(allLazyRoutePromises);

0 commit comments

Comments
 (0)