Skip to content

fix(solid-router): properly load components on lazy routes #3589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schiller-manuel merged 1 commit into from
Feb 27, 2025
Merged

fix(solid-router): properly load components on lazy routes #3589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions packages/solid-router/src/lazyRouteComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Dynamic, isServer } from 'solid-js/web'
import { createResource } from 'solid-js'
import { Outlet } from './Match'
import type * as Solid from 'solid-js'
import type { AsyncRouteComponent } from './route'
Expand Down Expand Up @@ -42,13 +43,14 @@ export function lazyRouteComponent<
const load = () => {
if (typeof document === 'undefined' && ssr?.() === false) {
comp = (() => null) as any
return Promise.resolve()
return Promise.resolve(comp)
}
if (!loadPromise) {
loadPromise = importer()
.then((res) => {
loadPromise = undefined
comp = res[exportName ?? 'default']
return comp
})
.catch((err) => {
error = err
Expand Down Expand Up @@ -94,18 +96,19 @@ export function lazyRouteComponent<
throw error
}

if (!comp) {
throw load()
}
const [compResource] = createResource(load, {
initialValue: comp,
ssrLoadFrom: 'initial',
})

if (ssr?.() === false) {
return (
<ClientOnly fallback={<Outlet />}>
<Dynamic component={comp} {...props} />
<Dynamic component={compResource()} {...props} />
</ClientOnly>
)
}
return <Dynamic component={comp} {...props} />
return <Dynamic component={compResource()} {...props} />
}

;(lazyComp as any).preload = load
Expand Down