diff --git a/examples/solid/start-supabase-basic/src/routes/__root.tsx b/examples/solid/start-supabase-basic/src/routes/__root.tsx
index aeb1838ccc..deb8f2370e 100644
--- a/examples/solid/start-supabase-basic/src/routes/__root.tsx
+++ b/examples/solid/start-supabase-basic/src/routes/__root.tsx
@@ -13,7 +13,7 @@ import { NotFound } from '../components/NotFound'
import appCss from '../styles/app.css?url'
import { seo } from '../utils/seo'
import { getSupabaseServerClient } from '../utils/supabase'
-import type * as Solid from 'solid-js'
+import type { JSX } from '@solidjs/web'
const fetchUser = createServerFn({ method: 'GET' }).handler(async () => {
const supabase = getSupabaseServerClient()
@@ -93,7 +93,7 @@ function RootComponent() {
)
}
-function RootDocument({ children }: { children: Solid.JSX.Element }) {
+function RootDocument({ children }: { children: JSX.Element }) {
const { user } = Route.useRouteContext()()
return (
diff --git a/examples/solid/start-supabase-basic/tsconfig.json b/examples/solid/start-supabase-basic/tsconfig.json
index ff0556e7a8..20848fb19d 100644
--- a/examples/solid/start-supabase-basic/tsconfig.json
+++ b/examples/solid/start-supabase-basic/tsconfig.json
@@ -4,7 +4,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"module": "ESNext",
"moduleResolution": "Bundler",
"lib": ["DOM", "DOM.Iterable", "ES2022"],
diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json
index 22126f5fbd..784e71f8dd 100644
--- a/examples/solid/start-tailwind-v4/package.json
+++ b/examples/solid/start-tailwind-v4/package.json
@@ -10,11 +10,11 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
+ "@solidjs/web": "2.0.0-beta.10",
"@tanstack/solid-router": "^2.0.0-beta.16",
"@tanstack/solid-router-devtools": "^2.0.0-beta.12",
"@tanstack/solid-start": "^2.0.0-beta.17",
- "solid-js": "2.0.0-beta.8",
- "@solidjs/web": "2.0.0-beta.8",
+ "solid-js": "2.0.0-beta.10",
"tailwind-merge": "^2.6.0",
"zod": "^3.24.2"
},
diff --git a/examples/solid/start-tailwind-v4/src/routes/__root.tsx b/examples/solid/start-tailwind-v4/src/routes/__root.tsx
index 71652b9ee7..e6c405ba82 100644
--- a/examples/solid/start-tailwind-v4/src/routes/__root.tsx
+++ b/examples/solid/start-tailwind-v4/src/routes/__root.tsx
@@ -8,7 +8,7 @@ import {
} from '@tanstack/solid-router'
import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools'
import * as React from 'react'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
import appCss from '~/styles/app.css?url'
export const Route = createRootRoute({
diff --git a/examples/solid/start-tailwind-v4/tsconfig.json b/examples/solid/start-tailwind-v4/tsconfig.json
index ff0556e7a8..20848fb19d 100644
--- a/examples/solid/start-tailwind-v4/tsconfig.json
+++ b/examples/solid/start-tailwind-v4/tsconfig.json
@@ -4,7 +4,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"module": "ESNext",
"moduleResolution": "Bundler",
"lib": ["DOM", "DOM.Iterable", "ES2022"],
diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json
index 631d1a2c72..3d309cde2a 100644
--- a/examples/solid/view-transitions/package.json
+++ b/examples/solid/view-transitions/package.json
@@ -9,19 +9,19 @@
"start": "vite"
},
"dependencies": {
+ "@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
+ "@tanstack/router-plugin": "^1.167.12",
"@tanstack/solid-router": "^2.0.0-beta.16",
"@tanstack/solid-router-devtools": "^2.0.0-beta.12",
- "@tanstack/router-plugin": "^1.167.12",
- "solid-js": "2.0.0-beta.8",
- "@solidjs/web": "2.0.0-beta.8",
"redaxios": "^0.5.1",
+ "solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.5",
"typescript": "^6.0.2",
- "vite": "^8.0.0"
+ "vite": "^8.0.0",
+ "vite-plugin-solid": "^3.0.0-next.5"
}
}
diff --git a/examples/solid/view-transitions/tsconfig.json b/examples/solid/view-transitions/tsconfig.json
index 6e3ba6f110..d493571031 100644
--- a/examples/solid/view-transitions/tsconfig.json
+++ b/examples/solid/view-transitions/tsconfig.json
@@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"skipLibCheck": true
}
diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json
index a97160b636..3c433701dc 100644
--- a/examples/solid/with-framer-motion/package.json
+++ b/examples/solid/with-framer-motion/package.json
@@ -9,12 +9,12 @@
"start": "vite"
},
"dependencies": {
+ "@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-router": "^2.0.0-beta.16",
"@tanstack/solid-router-devtools": "^2.0.0-beta.12",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.8",
- "@solidjs/web": "2.0.0-beta.8",
+ "solid-js": "2.0.0-beta.10",
"solid-motionone": "^1.0.4",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
diff --git a/examples/solid/with-framer-motion/tsconfig.json b/examples/solid/with-framer-motion/tsconfig.json
index c4df806b40..8a676599fb 100644
--- a/examples/solid/with-framer-motion/tsconfig.json
+++ b/examples/solid/with-framer-motion/tsconfig.json
@@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"skipLibCheck": true,
"lib": ["DOM", "DOM.Iterable", "ES2022"]
}
diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json
index 2d449c1c1d..d8850f7415 100644
--- a/examples/solid/with-trpc/package.json
+++ b/examples/solid/with-trpc/package.json
@@ -10,23 +10,23 @@
"start": "NODE_ENV=production node dist/server/server.js"
},
"dependencies": {
+ "@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
+ "@tanstack/router-plugin": "^1.167.12",
"@tanstack/solid-router": "^2.0.0-beta.16",
"@tanstack/solid-router-devtools": "^2.0.0-beta.12",
- "@tanstack/router-plugin": "^1.167.12",
"@trpc/client": "^11.4.3",
"@trpc/server": "^11.4.3",
"express": "^4.21.2",
- "solid-js": "2.0.0-beta.8",
- "@solidjs/web": "2.0.0-beta.8",
"redaxios": "^0.5.1",
+ "solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
},
"devDependencies": {
"@types/express": "^4.17.23",
- "vite-plugin-solid": "^3.0.0-next.5",
"tsx": "^4.20.3",
- "vite": "^8.0.0"
+ "vite": "^8.0.0",
+ "vite-plugin-solid": "^3.0.0-next.5"
}
}
diff --git a/examples/solid/with-trpc/tsconfig.json b/examples/solid/with-trpc/tsconfig.json
index 8455216992..3dc3006f4b 100644
--- a/examples/solid/with-trpc/tsconfig.json
+++ b/examples/solid/with-trpc/tsconfig.json
@@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"target": "ES2022",
"module": "ES2022",
"moduleResolution": "bundler",
diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json
index 9d4e50f387..6bcfc917cf 100644
--- a/packages/solid-router-devtools/package.json
+++ b/packages/solid-router-devtools/package.json
@@ -66,21 +66,21 @@
"node": ">=20.19"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.8",
+ "@solidjs/web": "2.0.0-beta.10",
"@tanstack/router-devtools-core": "workspace:*"
},
"devDependencies": {
- "solid-js": "2.0.0-beta.8",
- "@solidjs/web": "2.0.0-beta.8",
+ "@solidjs/web": "2.0.0-beta.10",
+ "@types/node": ">=20",
+ "solid-js": "2.0.0-beta.10",
"vite": "*",
- "vite-plugin-solid": "^3.0.0-next.5",
- "@types/node": ">=20"
+ "vite-plugin-solid": "^3.0.0-next.5"
},
"peerDependencies": {
+ "@solidjs/web": "2.0.0-beta.10",
"@tanstack/router-core": "workspace:^",
"@tanstack/solid-router": "workspace:^",
- "solid-js": "2.0.0-beta.8",
- "@solidjs/web": "2.0.0-beta.8"
+ "solid-js": "2.0.0-beta.10"
},
"peerDependenciesMeta": {
"@tanstack/router-core": {
diff --git a/packages/solid-router-devtools/src/TanStackRouterDevtools.tsx b/packages/solid-router-devtools/src/TanStackRouterDevtools.tsx
index 7e8772b709..adb228bb4e 100644
--- a/packages/solid-router-devtools/src/TanStackRouterDevtools.tsx
+++ b/packages/solid-router-devtools/src/TanStackRouterDevtools.tsx
@@ -2,7 +2,8 @@ import { useRouter, useRouterState } from '@tanstack/solid-router'
import { TanStackRouterDevtoolsCore } from '@tanstack/router-devtools-core'
import { createEffect, createSignal, onCleanup } from 'solid-js'
import type { AnyRouter } from '@tanstack/solid-router'
-import type { Component, JSX } from 'solid-js'
+import type { Component } from 'solid-js'
+import type { JSX } from '@solidjs/web'
export interface TanStackRouterDevtoolsOptions {
/**
diff --git a/packages/solid-router-devtools/src/TanStackRouterDevtoolsPanel.tsx b/packages/solid-router-devtools/src/TanStackRouterDevtoolsPanel.tsx
index 36ff8c89fb..9e7ad395b7 100644
--- a/packages/solid-router-devtools/src/TanStackRouterDevtoolsPanel.tsx
+++ b/packages/solid-router-devtools/src/TanStackRouterDevtoolsPanel.tsx
@@ -2,7 +2,8 @@ import { useRouter, useRouterState } from '@tanstack/solid-router'
import { TanStackRouterDevtoolsPanelCore } from '@tanstack/router-devtools-core'
import { createEffect, createSignal, onCleanup } from 'solid-js'
import type { AnyRouter } from '@tanstack/solid-router'
-import type { Component, JSX } from 'solid-js'
+import type { Component } from 'solid-js'
+import type { JSX } from '@solidjs/web'
export interface TanStackRouterDevtoolsPanelOptions {
/**
diff --git a/packages/solid-router-devtools/tsconfig.json b/packages/solid-router-devtools/tsconfig.json
index 3e806f6d62..d0ca493455 100644
--- a/packages/solid-router-devtools/tsconfig.json
+++ b/packages/solid-router-devtools/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node"]
},
"include": ["src", "vite.config.ts"]
diff --git a/packages/solid-router-ssr-query/package.json b/packages/solid-router-ssr-query/package.json
index 4907dc41a3..2a7e8a0426 100644
--- a/packages/solid-router-ssr-query/package.json
+++ b/packages/solid-router-ssr-query/package.json
@@ -67,19 +67,19 @@
"@tanstack/router-ssr-query-core": "workspace:*"
},
"devDependencies": {
- "@solidjs/web": "2.0.0-beta.8",
+ "@solidjs/web": "2.0.0-beta.10",
"@tanstack/solid-query": "^6.0.0-beta.4",
"@tanstack/solid-router": "workspace:*",
"eslint-plugin-solid": "^0.14.5",
- "solid-js": "2.0.0-beta.8",
+ "solid-js": "2.0.0-beta.10",
"vite": "*",
"vite-plugin-solid": "^3.0.0-next.5"
},
"peerDependencies": {
- "@solidjs/web": ">=2.0.0-beta.8",
+ "@solidjs/web": ">=2.0.0-beta.10",
"@tanstack/query-core": ">=5.90.0",
"@tanstack/solid-query": ">=5.90.0",
"@tanstack/solid-router": ">=2.0.0-alpha.1",
- "solid-js": ">=2.0.0-beta.8"
+ "solid-js": ">=2.0.0-beta.10"
}
}
diff --git a/packages/solid-router-ssr-query/src/index.tsx b/packages/solid-router-ssr-query/src/index.tsx
index 91f764f15f..3929507e82 100644
--- a/packages/solid-router-ssr-query/src/index.tsx
+++ b/packages/solid-router-ssr-query/src/index.tsx
@@ -2,7 +2,7 @@ import { QueryClientProvider } from '@tanstack/solid-query'
import { setupCoreRouterSsrQueryIntegration } from '@tanstack/router-ssr-query-core'
import type { RouterSsrQueryOptions } from '@tanstack/router-ssr-query-core'
import type { AnyRouter } from '@tanstack/solid-router'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
export type Options
=
RouterSsrQueryOptions & {
diff --git a/packages/solid-router-ssr-query/tsconfig.json b/packages/solid-router-ssr-query/tsconfig.json
index e24672b5de..74620fe5a2 100644
--- a/packages/solid-router-ssr-query/tsconfig.json
+++ b/packages/solid-router-ssr-query/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js"
+ "jsxImportSource": "@solidjs/web"
},
"include": ["src", "tests", "vite.config.ts"]
}
diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json
index 36cf4c40c8..358768ab66 100644
--- a/packages/solid-router/package.json
+++ b/packages/solid-router/package.json
@@ -106,27 +106,27 @@
"dependencies": {
"@solid-devtools/logger": "^0.9.4",
"@solidjs/meta": "^0.29.4",
- "@solidjs/web": "2.0.0-beta.8",
+ "@solidjs/web": "2.0.0-beta.10",
"@tanstack/history": "workspace:*",
"@tanstack/router-core": "workspace:*",
"isbot": "^5.1.22"
},
"devDependencies": {
"@solidjs/testing-library": "^0.8.10",
+ "@solidjs/web": "2.0.0-beta.10",
"@tanstack/intent": "^0.0.14",
"@testing-library/jest-dom": "^6.6.3",
+ "@types/node": ">=20",
"combinate": "^1.1.11",
"eslint-plugin-solid": "^0.14.5",
- "solid-js": "2.0.0-beta.8",
- "@solidjs/web": "2.0.0-beta.8",
+ "solid-js": "2.0.0-beta.10",
"vite": "*",
"vite-plugin-solid": "^3.0.0-next.5",
- "zod": "^3.23.8",
- "@types/node": ">=20"
+ "zod": "^3.23.8"
},
"peerDependencies": {
- "solid-js": ">=2.0.0-0 <3.0.0",
- "@solidjs/web": ">=2.0.0-0 <3.0.0"
+ "@solidjs/web": ">=2.0.0-0 <3.0.0",
+ "solid-js": ">=2.0.0-0 <3.0.0"
},
"bin": {
"intent": "./bin/intent.js"
diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx
index 586d91e2d3..9279bfee02 100644
--- a/packages/solid-router/src/Asset.tsx
+++ b/packages/solid-router/src/Asset.tsx
@@ -2,7 +2,7 @@ import { isServer } from '@tanstack/router-core/isServer'
import { createEffect } from 'solid-js'
import { useRouter } from './useRouter'
import type { RouterManagedTag } from '@tanstack/router-core'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
export function Asset({
tag,
diff --git a/packages/solid-router/src/CatchBoundary.tsx b/packages/solid-router/src/CatchBoundary.tsx
index 70e5320ec4..2313aad980 100644
--- a/packages/solid-router/src/CatchBoundary.tsx
+++ b/packages/solid-router/src/CatchBoundary.tsx
@@ -1,11 +1,12 @@
import * as Solid from 'solid-js'
import { Dynamic } from '@solidjs/web'
import type { ErrorRouteComponent } from './route'
+import type { JSX } from '@solidjs/web'
export function CatchBoundary(
props: {
getResetKey: () => number | string
- children: Solid.JSX.Element
+ children: JSX.Element
errorComponent?: ErrorRouteComponent
onCatch?: (error: Error) => void
} & Solid.ParentProps,
diff --git a/packages/solid-router/src/ClientOnly.tsx b/packages/solid-router/src/ClientOnly.tsx
index f1d2ab53ac..ea0284cd1f 100644
--- a/packages/solid-router/src/ClientOnly.tsx
+++ b/packages/solid-router/src/ClientOnly.tsx
@@ -1,14 +1,15 @@
import * as Solid from 'solid-js'
+import type { JSX } from '@solidjs/web'
export interface ClientOnlyProps {
/**
* The children to render when the JS is loaded.
*/
- children: Solid.JSX.Element
+ children: JSX.Element
/**
* The fallback component to render if the JS is not yet loaded.
*/
- fallback?: Solid.JSX.Element
+ fallback?: JSX.Element
}
/**
diff --git a/packages/solid-router/src/Matches.tsx b/packages/solid-router/src/Matches.tsx
index d63e524c6b..5fee298375 100644
--- a/packages/solid-router/src/Matches.tsx
+++ b/packages/solid-router/src/Matches.tsx
@@ -24,6 +24,7 @@ import type {
RouteByPath,
ToSubOptionsProps,
} from '@tanstack/router-core'
+import type { JSX } from '@solidjs/web'
const NearestMatchContext = nearestMatchContext as unknown as Solid.Component<{
value: any
@@ -32,11 +33,11 @@ const NearestMatchContext = nearestMatchContext as unknown as Solid.Component<{
declare module '@tanstack/router-core' {
export interface RouteMatchExtensions {
- meta?: Array
- links?: Array
- scripts?: Array
- styles?: Array
- headScripts?: Array
+ meta?: Array
+ links?: Array
+ scripts?: Array
+ styles?: Array
+ headScripts?: Array
}
}
@@ -183,8 +184,8 @@ export type MakeMatchRouteOptions<
TRouter['routeTree'],
ResolveRelativePath>
>['types']['allParams'],
- ) => Solid.JSX.Element)
- | Solid.JSX.Element
+ ) => JSX.Element)
+ | JSX.Element
}
export function MatchRoute<
diff --git a/packages/solid-router/src/RouterProvider.tsx b/packages/solid-router/src/RouterProvider.tsx
index d38abc68a8..f41394a6c6 100644
--- a/packages/solid-router/src/RouterProvider.tsx
+++ b/packages/solid-router/src/RouterProvider.tsx
@@ -7,6 +7,7 @@ import type {
RegisteredRouter,
RouterOptions,
} from '@tanstack/router-core'
+import type { JSX } from '@solidjs/web'
const RouterContext = routerContext as unknown as Solid.Component<{
value: any
@@ -21,7 +22,7 @@ export function RouterContextProvider<
children,
...rest
}: RouterProps & {
- children: () => Solid.JSX.Element
+ children: () => JSX.Element
}) {
if (Object.keys(rest).length > 0) {
Solid.runWithOwner(null, () => {
diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx
index 0f6d665341..191b1bb1b7 100644
--- a/packages/solid-router/src/link.tsx
+++ b/packages/solid-router/src/link.tsx
@@ -27,6 +27,7 @@ import type {
ValidateLinkOptions,
ValidateLinkOptionsArray,
} from './typePrimitives'
+import type { ComponentProps, JSX, ValidComponent } from '@solidjs/web'
function mergeRefs(
...refs: Array<((el: T) => void) | undefined>
@@ -63,7 +64,7 @@ export function useLinkProps<
TMaskTo extends string = '',
>(
options: UseLinkPropsOptions,
-): Solid.ComponentProps<'a'> {
+): ComponentProps<'a'> {
const router = useRouter()
const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)
const shouldHydrateHash = !isServer && !!router.options.ssr
@@ -417,8 +418,8 @@ export function useLinkProps<
handleTouchStart,
)
- type ResolvedLinkStateProps = Omit, 'style'> & {
- style?: Solid.JSX.CSSProperties
+ type ResolvedLinkStateProps = Omit, 'style'> & {
+ style?: JSX.CSSProperties
}
const resolvedProps = Solid.createMemo(() => {
@@ -500,7 +501,7 @@ const STATIC_TRANSITIONING_ATTRIBUTES = {
/** Call a JSX.EventHandlerUnion with the event. */
function callHandler(
event: TEvent & { currentTarget: T; target: Element },
- handler: Solid.JSX.EventHandlerUnion,
+ handler: JSX.EventHandlerUnion,
) {
if (typeof handler === 'function') {
handler(event)
@@ -511,7 +512,7 @@ function callHandler(
}
function createComposedHandler(
- getHandler: () => Solid.JSX.EventHandlerUnion | undefined,
+ getHandler: () => JSX.EventHandlerUnion | undefined,
fallback: (event: TEvent) => void,
) {
return (event: TEvent & { currentTarget: T; target: Element }) => {
@@ -527,7 +528,7 @@ export type UseLinkPropsOptions<
TMaskFrom extends RoutePaths | string = TFrom,
TMaskTo extends string = '.',
> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &
- Omit, 'style'> & { style?: Solid.JSX.CSSProperties }
+ Omit, 'style'> & { style?: JSX.CSSProperties }
export type ActiveLinkOptions<
TComp = 'a',
@@ -571,15 +572,12 @@ export type LinkProps<
export interface LinkPropsChildren {
// If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
children?:
- | Solid.JSX.Element
- | ((state: {
- isActive: boolean
- isTransitioning: boolean
- }) => Solid.JSX.Element)
+ | JSX.Element
+ | ((state: { isActive: boolean; isTransitioning: boolean }) => JSX.Element)
}
-type LinkComponentSolidProps = TComp extends Solid.ValidComponent
- ? Omit, keyof CreateLinkProps>
+type LinkComponentSolidProps = TComp extends ValidComponent
+ ? Omit, keyof CreateLinkProps>
: never
export type LinkComponentProps<
@@ -612,7 +610,7 @@ export type LinkComponent<
const TMaskTo extends string = '',
>(
props: LinkComponentProps,
-) => Solid.JSX.Element
+) => JSX.Element
export interface LinkComponentRoute<
in out TDefaultFrom extends string = string,
@@ -631,11 +629,11 @@ export interface LinkComponentRoute<
this['defaultFrom'],
TMaskTo
>,
- ): Solid.JSX.Element
+ ): JSX.Element
}
export function createLink(
- Comp: Constrain Solid.JSX.Element>,
+ Comp: Constrain JSX.Element>,
): LinkComponent {
return (props) =>
+
{children()}
)
diff --git a/packages/solid-router/src/not-found.tsx b/packages/solid-router/src/not-found.tsx
index 19fe0a28f2..010076d37a 100644
--- a/packages/solid-router/src/not-found.tsx
+++ b/packages/solid-router/src/not-found.tsx
@@ -3,6 +3,7 @@ import * as Solid from 'solid-js'
import { CatchBoundary } from './CatchBoundary'
import { useRouter } from './useRouter'
import type { NotFoundError } from '@tanstack/router-core'
+import type { JSX } from '@solidjs/web'
// Solid wraps non-Error throws in an Error and stores the original thrown value
// on `cause`, so component-thrown `notFound()` needs one extra unwrapping step.
@@ -21,9 +22,9 @@ export function getNotFound(
}
export function CatchNotFound(props: {
- fallback?: (error: NotFoundError) => Solid.JSX.Element
+ fallback?: (error: NotFoundError) => JSX.Element
onCatch?: (error: NotFoundError) => void
- children: Solid.JSX.Element
+ children: JSX.Element
}) {
const router = useRouter()
// TODO: Some way for the user to programmatically reset the not-found boundary?
diff --git a/packages/solid-router/src/route.tsx b/packages/solid-router/src/route.tsx
index da7e639a3a..8e9a18a094 100644
--- a/packages/solid-router/src/route.tsx
+++ b/packages/solid-router/src/route.tsx
@@ -44,9 +44,9 @@ import type { UseMatchRoute } from './useMatch'
import type { UseLoaderDepsRoute } from './useLoaderDeps'
import type { UseParamsRoute } from './useParams'
import type { UseSearchRoute } from './useSearch'
-import type * as Solid from 'solid-js'
import type { UseRouteContextRoute } from './useRouteContext'
import type { LinkComponentRoute } from './link'
+import type { JSX } from '@solidjs/web'
declare module '@tanstack/router-core' {
export interface UpdatableRouteOptionsExtensions {
@@ -57,11 +57,7 @@ declare module '@tanstack/router-core' {
}
export interface RootRouteOptionsExtensions {
- shellComponent?: ({
- children,
- }: {
- children: Solid.JSX.Element
- }) => Solid.JSX.Element
+ shellComponent?: ({ children }: { children: JSX.Element }) => JSX.Element
}
export interface RouteExtensions<
@@ -537,7 +533,7 @@ export function createRouteMask<
return opts as any
}
-export type SolidNode = Solid.JSX.Element
+export type SolidNode = JSX.Element
export interface DefaultRouteTypes {
component: (props: TProps) => any
diff --git a/packages/solid-router/src/router.ts b/packages/solid-router/src/router.ts
index 3fce7c9d75..672fff95dd 100644
--- a/packages/solid-router/src/router.ts
+++ b/packages/solid-router/src/router.ts
@@ -12,7 +12,7 @@ import type {
NotFoundRouteComponent,
RouteComponent,
} from './route'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
declare module '@tanstack/router-core' {
export interface RouterOptionsExtensions {
diff --git a/packages/solid-router/src/ssr/renderRouterToStream.tsx b/packages/solid-router/src/ssr/renderRouterToStream.tsx
index a3827b6bf8..92a9d6d718 100644
--- a/packages/solid-router/src/ssr/renderRouterToStream.tsx
+++ b/packages/solid-router/src/ssr/renderRouterToStream.tsx
@@ -2,9 +2,9 @@ import * as Solid from '@solidjs/web'
import { isbot } from 'isbot'
import { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'
import { makeSsrSerovalPlugin } from '@tanstack/router-core'
-import type { JSXElement } from 'solid-js'
import type { ReadableStream } from 'node:stream/web'
import type { AnyRouter } from '@tanstack/router-core'
+import type { JSX } from '@solidjs/web'
export const renderRouterToStream = async ({
request,
@@ -15,7 +15,7 @@ export const renderRouterToStream = async ({
request: Request
router: AnyRouter
responseHeaders: Headers
- children: () => JSXElement
+ children: () => JSX.Element
}) => {
const { writable, readable } = new TransformStream()
diff --git a/packages/solid-router/src/ssr/renderRouterToString.tsx b/packages/solid-router/src/ssr/renderRouterToString.tsx
index 3be8bb2a19..c89589a93e 100644
--- a/packages/solid-router/src/ssr/renderRouterToString.tsx
+++ b/packages/solid-router/src/ssr/renderRouterToString.tsx
@@ -1,7 +1,7 @@
import * as Solid from '@solidjs/web'
import { makeSsrSerovalPlugin } from '@tanstack/router-core'
import type { AnyRouter } from '@tanstack/router-core'
-import type { JSXElement } from 'solid-js'
+import type { JSX } from '@solidjs/web'
export const renderRouterToString = ({
router,
@@ -10,7 +10,7 @@ export const renderRouterToString = ({
}: {
router: AnyRouter
responseHeaders: Headers
- children: () => JSXElement
+ children: () => JSX.Element
}) => {
try {
const serializationAdapters =
diff --git a/packages/solid-router/tests/disableGlobalCatchBoundary.test.tsx b/packages/solid-router/tests/disableGlobalCatchBoundary.test.tsx
index b77c45ff58..2113cea268 100644
--- a/packages/solid-router/tests/disableGlobalCatchBoundary.test.tsx
+++ b/packages/solid-router/tests/disableGlobalCatchBoundary.test.tsx
@@ -8,7 +8,7 @@ import {
createRoute,
createRouter,
} from '../src'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
import type { RouterHistory } from '../src'
let history: RouterHistory
diff --git a/packages/solid-router/tests/link.bench.tsx b/packages/solid-router/tests/link.bench.tsx
index f9585db3a0..592e90552c 100644
--- a/packages/solid-router/tests/link.bench.tsx
+++ b/packages/solid-router/tests/link.bench.tsx
@@ -12,9 +12,10 @@ import {
} from '../src'
import type { LinkProps } from '../src'
import type * as Solid from 'solid-js'
+import type { JSX } from '@solidjs/web'
const createRouterRenderer =
- (routesCount: number) => (children: Solid.JSX.Element) => {
+ (routesCount: number) => (children: JSX.Element) => {
const rootRoute = createRootRoute()
const indexRoute = createRoute({
getParentRoute: () => rootRoute,
diff --git a/packages/solid-router/tests/link.test.tsx b/packages/solid-router/tests/link.test.tsx
index 5af84f3716..5aff4a52e1 100644
--- a/packages/solid-router/tests/link.test.tsx
+++ b/packages/solid-router/tests/link.test.tsx
@@ -40,6 +40,7 @@ import {
sleep,
} from './utils'
import type { RouterHistory } from '../src'
+import type { JSX } from '@solidjs/web'
const ioObserveMock = vi.fn()
const ioDisconnectMock = vi.fn()
@@ -5350,7 +5351,7 @@ describe('createLink', () => {
it('should respect target attribute set by custom component', async () => {
const CustomLinkWithTarget = (props: {
href?: string
- children?: Solid.JSX.Element
+ children?: JSX.Element
ref?: (el: HTMLAnchorElement) => void
}) => (