@tanstack/solid-router 1.133.15 → 1.133.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/dist/cjs/ClientOnly.cjs +12 -2
  2. package/dist/cjs/ClientOnly.cjs.map +1 -1
  3. package/dist/cjs/ClientOnly.d.cts +1 -1
  4. package/dist/cjs/HeadContent.cjs.map +1 -1
  5. package/dist/cjs/HeadContent.d.cts +3 -1
  6. package/dist/cjs/Matches.cjs +16 -7
  7. package/dist/cjs/Matches.cjs.map +1 -1
  8. package/dist/cjs/RouterProvider.cjs +1 -1
  9. package/dist/cjs/RouterProvider.cjs.map +1 -1
  10. package/dist/cjs/Transitioner.cjs +3 -0
  11. package/dist/cjs/Transitioner.cjs.map +1 -1
  12. package/dist/cjs/ssr/renderRouterToStream.cjs +2 -1
  13. package/dist/cjs/ssr/renderRouterToStream.cjs.map +1 -1
  14. package/dist/cjs/ssr/renderRouterToString.cjs +1 -1
  15. package/dist/cjs/ssr/renderRouterToString.cjs.map +1 -1
  16. package/dist/esm/ClientOnly.d.ts +1 -1
  17. package/dist/esm/ClientOnly.js +13 -3
  18. package/dist/esm/ClientOnly.js.map +1 -1
  19. package/dist/esm/HeadContent.d.ts +3 -1
  20. package/dist/esm/HeadContent.js.map +1 -1
  21. package/dist/esm/Matches.js +16 -7
  22. package/dist/esm/Matches.js.map +1 -1
  23. package/dist/esm/RouterProvider.js +1 -1
  24. package/dist/esm/RouterProvider.js.map +1 -1
  25. package/dist/esm/Transitioner.js +3 -0
  26. package/dist/esm/Transitioner.js.map +1 -1
  27. package/dist/esm/ssr/renderRouterToStream.js +3 -1
  28. package/dist/esm/ssr/renderRouterToStream.js.map +1 -1
  29. package/dist/esm/ssr/renderRouterToString.js +1 -1
  30. package/dist/esm/ssr/renderRouterToString.js.map +1 -1
  31. package/dist/source/ClientOnly.d.ts +1 -1
  32. package/dist/source/ClientOnly.jsx +28 -2
  33. package/dist/source/ClientOnly.jsx.map +1 -1
  34. package/dist/source/HeadContent.d.ts +3 -1
  35. package/dist/source/HeadContent.jsx +3 -1
  36. package/dist/source/HeadContent.jsx.map +1 -1
  37. package/dist/source/Matches.jsx +7 -6
  38. package/dist/source/Matches.jsx.map +1 -1
  39. package/dist/source/RouterProvider.d.ts +1 -1
  40. package/dist/source/RouterProvider.jsx +1 -1
  41. package/dist/source/RouterProvider.jsx.map +1 -1
  42. package/dist/source/Transitioner.jsx +3 -0
  43. package/dist/source/Transitioner.jsx.map +1 -1
  44. package/dist/source/ssr/renderRouterToStream.jsx +5 -1
  45. package/dist/source/ssr/renderRouterToStream.jsx.map +1 -1
  46. package/dist/source/ssr/renderRouterToString.jsx +1 -1
  47. package/dist/source/ssr/renderRouterToString.jsx.map +1 -1
  48. package/package.json +2 -2
  49. package/src/ClientOnly.tsx +30 -3
  50. package/src/HeadContent.tsx +3 -1
  51. package/src/Matches.tsx +9 -6
  52. package/src/RouterProvider.tsx +2 -2
  53. package/src/Transitioner.tsx +4 -0
  54. package/src/ssr/renderRouterToStream.tsx +13 -3
  55. package/src/ssr/renderRouterToString.tsx +1 -1
package/src/Matches.tsx CHANGED
@@ -6,8 +6,8 @@ import { useRouterState } from './useRouterState'
6
6
  import { useRouter } from './useRouter'
7
7
  import { Transitioner } from './Transitioner'
8
8
  import { matchContext } from './matchContext'
9
- import { Match } from './Match'
10
9
  import { SafeFragment } from './SafeFragment'
10
+ import { Match } from './Match'
11
11
  import type {
12
12
  AnyRoute,
13
13
  AnyRouter,
@@ -40,7 +40,6 @@ declare module '@tanstack/router-core' {
40
40
  export function Matches() {
41
41
  const router = useRouter()
42
42
 
43
- // Do not render a root Suspense during SSR or hydrating from SSR
44
43
  const ResolvedSuspense =
45
44
  router.isServer || (typeof document !== 'undefined' && router.ssr)
46
45
  ? SafeFragment
@@ -58,7 +57,7 @@ export function Matches() {
58
57
  <ResolvedSuspense
59
58
  fallback={PendingComponent ? <PendingComponent /> : null}
60
59
  >
61
- {!router.isServer && <Transitioner />}
60
+ <Transitioner />
62
61
  <MatchesInner />
63
62
  </ResolvedSuspense>
64
63
  </OptionalWrapper>
@@ -78,8 +77,11 @@ function MatchesInner() {
78
77
  })
79
78
 
80
79
  const matchComponent = () => {
81
- const id = matchId()
82
- return id ? <Match matchId={id} /> : null
80
+ return (
81
+ <Solid.Show when={matchId()}>
82
+ <Match matchId={matchId()!} />
83
+ </Solid.Show>
84
+ )
83
85
  }
84
86
 
85
87
  return (
@@ -93,7 +95,8 @@ function MatchesInner() {
93
95
  onCatch={(error) => {
94
96
  warning(
95
97
  false,
96
- `The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,
98
+ `The following error wasn't caught by any route! At the very leas
99
+ t, consider setting an 'errorComponent' in your RootRoute!`,
97
100
  )
98
101
  warning(false, error.message || error.toString())
99
102
  }}
package/src/RouterProvider.tsx CHANGED
@@ -1,12 +1,12 @@
1
- import { Matches } from './Matches'
2
1
  import { getRouterContext } from './routerContext'
3
2
  import { SafeFragment } from './SafeFragment'
4
- import type * as Solid from 'solid-js'
3
+ import { Matches } from './Matches'
5
4
  import type {
6
5
  AnyRouter,
7
6
  RegisteredRouter,
8
7
  RouterOptions,
9
8
  } from '@tanstack/router-core'
9
+ import type * as Solid from 'solid-js'
10
10
 
11
11
  export function RouterContextProvider<
12
12
  TRouter extends AnyRouter = RegisteredRouter,
package/src/Transitioner.tsx CHANGED
@@ -15,6 +15,10 @@ export function Transitioner() {
15
15
  select: ({ isLoading }) => isLoading,
16
16
  })
17
17
 
18
+ if (router.isServer) {
19
+ return null
20
+ }
21
+
18
22
  const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)
19
23
  // Track pending state changes
20
24
  const hasPendingMatches = useRouterState({
package/src/ssr/renderRouterToStream.tsx CHANGED
@@ -18,9 +18,19 @@ export const renderRouterToStream = async ({
18
18
  }) => {
19
19
  const { writable, readable } = new TransformStream()
20
20
 
21
- const stream = Solid.renderToStream(children, {
22
- nonce: router.options.ssr?.nonce,
23
- })
21
+ const docType = Solid.ssr('<!DOCTYPE html>')
22
+
23
+ const stream = Solid.renderToStream(
24
+ () => (
25
+ <>
26
+ {docType}
27
+ {children()}
28
+ </>
29
+ ),
30
+ {
31
+ nonce: router.options.ssr?.nonce,
32
+ },
33
+ )
24
34
 
25
35
  if (isbot(request.headers.get('User-Agent'))) {
26
36
  await stream
package/src/ssr/renderRouterToString.tsx CHANGED
@@ -20,7 +20,7 @@ export const renderRouterToString = async ({
20
20
  (htmls) => htmls.join(''),
21
21
  )
22
22
  html = html.replace(`</body>`, `${injectedHtml}</body>`)
23
- return new Response(html, {
23
+ return new Response(`<!DOCTYPE html>${html}`, {
24
24
  status: router.state.statusCode,
25
25
  headers: responseHeaders,
26
26
  })