diff --git a/packages/solid-router/src/Match.tsx b/packages/solid-router/src/Match.tsx index 3f07c8889b..e43df877d3 100644 --- a/packages/solid-router/src/Match.tsx +++ b/packages/solid-router/src/Match.tsx @@ -354,9 +354,10 @@ export const MatchInner = (): any => { {(_) => { const [displayPendingResult] = Solid.createResource( - () => - router.getMatch(currentMatch().id)?._nonReactive - .displayPendingPromise, + (): Promise | undefined => + router + .getMatch(currentMatch().id) + ?._nonReactive.displayPendingPromise?.then(() => null), ) return <>{displayPendingResult() ?? renderPending()} @@ -365,9 +366,10 @@ export const MatchInner = (): any => { {(_) => { const [minPendingResult] = Solid.createResource( - () => - router.getMatch(currentMatch().id)?._nonReactive - .minPendingPromise, + (): Promise | undefined => + router + .getMatch(currentMatch().id) + ?._nonReactive.minPendingPromise?.then(() => null), ) return <>{minPendingResult() ?? renderPending()} @@ -401,11 +403,16 @@ export const MatchInner = (): any => { } } - const [loaderResult] = Solid.createResource(async () => { - await new Promise((r) => setTimeout(r, 0)) - return router.getMatch(currentMatch().id)?._nonReactive - .loadPromise - }) + const [loaderResult] = Solid.createResource( + (): Promise => + new Promise((r) => setTimeout(r, 0)) + .then( + () => + router.getMatch(currentMatch().id)?._nonReactive + .loadPromise, + ) + .then(() => null), + ) return <>{loaderResult() ?? renderPending()} }} @@ -447,16 +454,20 @@ export const MatchInner = (): any => { invariant() } - const [loaderResult] = Solid.createResource(async () => { - await new Promise((r) => setTimeout(r, 0)) - return getLoadPromise(matchId, routerMatch) - }) + const [loaderResult] = Solid.createResource( + (): Promise => + new Promise((r) => setTimeout(r, 0)) + .then(() => getLoadPromise(matchId, routerMatch)) + .then(() => null), + ) const [retainedPendingResult] = Solid.createResource( - async () => { - await new Promise((r) => setTimeout(r, 0)) - return getRetainedPendingPromise(matchId, routerMatch) - }, + (): Promise => + new Promise((r) => setTimeout(r, 0)) + .then(() => + getRetainedPendingPromise(matchId, routerMatch), + ) + .then(() => null), ) return <>{loaderResult() ?? retainedPendingResult()}