refactor(router-core): begin migrating types from react-router and solid-router to router-core #3538

chorobin · 2025-02-23T19:46:07Z

Migrates many types over but there is still a lot to do D:

…lid-router to router-core

nx-cloud · 2025-02-23T19:48:08Z

View your CI Pipeline Execution ↗ for commit 86e9ae7.

Command	Status	Duration	Result
`nx affected --targets=test:eslint,test:unit,tes...`	✅ Succeeded	4m 57s	View ↗
`nx run-many --target=build --exclude=examples/*...`	✅ Succeeded	1m 21s	View ↗

☁️ Nx Cloud last updated this comment at 2025-02-23 22:09:24 UTC

pkg-pr-new · 2025-02-23T19:51:57Z

Open in Stackblitz

More templates

@tanstack/arktype-adapter

npm i https://pkg.pr.new/@tanstack/arktype-adapter@3538

@tanstack/create-router

npm i https://pkg.pr.new/@tanstack/create-router@3538

@tanstack/directive-functions-plugin

npm i https://pkg.pr.new/@tanstack/directive-functions-plugin@3538

@tanstack/create-start

npm i https://pkg.pr.new/@tanstack/create-start@3538

@tanstack/eslint-plugin-router

npm i https://pkg.pr.new/@tanstack/eslint-plugin-router@3538

@tanstack/history

npm i https://pkg.pr.new/@tanstack/history@3538

@tanstack/react-cross-context

npm i https://pkg.pr.new/@tanstack/react-cross-context@3538

@tanstack/react-router

npm i https://pkg.pr.new/@tanstack/react-router@3538

@tanstack/react-router-with-query

npm i https://pkg.pr.new/@tanstack/react-router-with-query@3538

@tanstack/router-cli

npm i https://pkg.pr.new/@tanstack/router-cli@3538

@tanstack/router-core

npm i https://pkg.pr.new/@tanstack/router-core@3538

@tanstack/router-devtools

npm i https://pkg.pr.new/@tanstack/router-devtools@3538

@tanstack/router-generator

npm i https://pkg.pr.new/@tanstack/router-generator@3538

@tanstack/router-plugin

npm i https://pkg.pr.new/@tanstack/router-plugin@3538

@tanstack/router-utils

npm i https://pkg.pr.new/@tanstack/router-utils@3538

@tanstack/router-vite-plugin

npm i https://pkg.pr.new/@tanstack/router-vite-plugin@3538

@tanstack/server-functions-plugin

npm i https://pkg.pr.new/@tanstack/server-functions-plugin@3538

@tanstack/solid-cross-context

npm i https://pkg.pr.new/@tanstack/solid-cross-context@3538

@tanstack/solid-router

npm i https://pkg.pr.new/@tanstack/solid-router@3538

@tanstack/start

npm i https://pkg.pr.new/@tanstack/start@3538

@tanstack/start-api-routes

npm i https://pkg.pr.new/@tanstack/start-api-routes@3538

@tanstack/start-client

npm i https://pkg.pr.new/@tanstack/start-client@3538

@tanstack/start-config

npm i https://pkg.pr.new/@tanstack/start-config@3538

@tanstack/start-plugin

npm i https://pkg.pr.new/@tanstack/start-plugin@3538

@tanstack/start-router-manifest

npm i https://pkg.pr.new/@tanstack/start-router-manifest@3538

@tanstack/start-server

npm i https://pkg.pr.new/@tanstack/start-server@3538

@tanstack/start-server-functions-client

npm i https://pkg.pr.new/@tanstack/start-server-functions-client@3538

@tanstack/start-server-functions-fetcher

npm i https://pkg.pr.new/@tanstack/start-server-functions-fetcher@3538

@tanstack/start-server-functions-handler

npm i https://pkg.pr.new/@tanstack/start-server-functions-handler@3538

@tanstack/start-server-functions-server

npm i https://pkg.pr.new/@tanstack/start-server-functions-server@3538

@tanstack/start-server-functions-ssr

npm i https://pkg.pr.new/@tanstack/start-server-functions-ssr@3538

@tanstack/valibot-adapter

npm i https://pkg.pr.new/@tanstack/valibot-adapter@3538

@tanstack/virtual-file-routes

npm i https://pkg.pr.new/@tanstack/virtual-file-routes@3538

@tanstack/zod-adapter

npm i https://pkg.pr.new/@tanstack/zod-adapter@3538

commit: 86e9ae7

…s-migrate-to-core

SeanCassiere · 2025-02-23T21:16:15Z

packages/react-router/src/route.ts

  Constrain,
  ConstrainLiteral,
+  RootRoute as CoreRootRoute,
+  Route as CoreRoute,


Should we follow this and prefix all of these imports from router-core with Core? or is the DX without adding this prefix fine?

tbh this was just a way for me to alias the Route type in core but keep the current Route class in this file

I was hoping to settle this in a later pr because I am still not sure how the runtime will end up in core. We might still need a class in react-router and core, I really do not know

schiller-manuel · 2025-02-23T21:50:02Z

packages/react-router/tests/fileRoute.test-d.tsx

@@ -17,7 +17,7 @@ const postRoute = createFileRoute('/_postLayout/posts/$postId_')()

 const protectedRoute = createFileRoute('/(auth)/protected')()

-declare module '../src/fileRoute' {
+declare module '@tanstack/router-core' {


why don't we move the type test to router-core as well?

Maybe we can in another pr. atm I don't want to change them too much because I want to rely on them to check I haven't broken anything

no worries, just trying to understand where you are heading
i just hope we can limit duplication to the absolut minimum, and this also includes tests

SimenB · 2025-02-24T08:26:23Z

Presumably this change is the reason for this error?

node_modules/@tanstack/react-router/dist/esm/fileRoute.d.ts:45:120 - error TS2344: Type 'RouteById<RootRoute<undefined, { queryClient: QueryClient; }, AnyContext, AnyContext, {}, undefined, RootRouteChildren, FileRouteTypes>, TId>' does not satisfy the constraint 'AnyRoute'.
  Type 'RootRoute<undefined, { queryClient: QueryClient; }, AnyContext, AnyContext, {}, undefined, unknown, unknown> | Route<RootRoute<undefined, { queryClient: QueryClient; }, ... 5 more ..., unknown>, ... 12 more ..., unknown> | Route<...> | Route<...> | Route<...> | Route<...>' is not assignable to type 'Route<any, any, any, any, any, any, any, any, any, any, any, any, any, any>'.
    Type 'RootRoute<undefined, { queryClient: QueryClient; }, AnyContext, AnyContext, {}, undefined, unknown, unknown>' is not assignable to type 'Route<any, any, any, any, any, any, any, any, any, any, any, any, any, any>'.
      The types returned by 'update(...)' are incompatible between these types.
        Type 'RootRoute<undefined, { queryClient: QueryClient; }, AnyContext, AnyContext, {}, undefined, unknown, unknown>' is not assignable to type 'RouteById<RootRoute<undefined, { queryClient: QueryClient; }, AnyContext, AnyContext, {}, undefined, RootRouteChildren, FileRouteTypes>, TId>'.

45 export declare function createLazyRoute<TId extends RouteIds<RegisteredRouter['routeTree']>, TRoute extends AnyRoute = RouteById<RegisteredRouter['routeTree'], TId>>(id: TId): (opts: LazyRouteOptions) => LazyRoute<TRoute>;
                                                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

We do

createRootRouteWithContext<{ queryClient: QueryClient }>()(
  {
    component: Root,
    wrapInSuspense: true,
  },
);

removing the context generic "fixes" the problem.

Keeping @tanstack/react-router at 1.109.2 works, even if @tanstack/router-* is at 1.111.3

schiller-manuel · 2025-02-24T08:50:22Z

@SimenB can you please open a new GitHub issue and attach a minimal example? our tests and examples did not hit that issue so we need to have a look at what you are doing differently

SimenB · 2025-02-24T09:07:29Z

The basic example fails if you remove skipLibCheck: true: https://tanstack.com/router/v1/docs/framework/react/examples/basic-react-query

SimenB · 2025-02-25T06:22:45Z

Seems to be fixed in 1.111.7 👍

This PR introduce support for Solid to be used with TanStack Start. There are several ongoing refactors that can influence the timing of when it's most feasible to merge this. ### Status (build and run e2e/solid-start/basic) - [X] SSR - [x] API Routes - [x] Server Functions - [x] HMR - [x] Streaming (/stream route) - [X] Timely hydration ### Ongoing refactors Refactor to make router packages (aka. client-only features) more agnostic: - #3552 - #3540 - #3538 - #3171 Refactor to make start packages (aka. server features) more agnostic: - #3546 - #3563 - #3565 ### Upstream changes to solid-router - #3592 - #3591 - #3589 - #3616 ### Passing E2E test suites - [x] basic - [x] website - [x] scroll-restoration - [x] server-functions --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Brenley Dueck <brenleydueck@gmail.com> Co-authored-by: Iha Shin <me@xiniha.dev> Co-authored-by: Brenley Dueck <brenley@crowdbotics.com>

…lid-router to router-core (TanStack#3538) Migrates many types over but there is still a lot to do D: --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

This PR introduce support for Solid to be used with TanStack Start. There are several ongoing refactors that can influence the timing of when it's most feasible to merge this. ### Status (build and run e2e/solid-start/basic) - [X] SSR - [x] API Routes - [x] Server Functions - [x] HMR - [x] Streaming (/stream route) - [X] Timely hydration ### Ongoing refactors Refactor to make router packages (aka. client-only features) more agnostic: - TanStack#3552 - TanStack#3540 - TanStack#3538 - TanStack#3171 Refactor to make start packages (aka. server features) more agnostic: - TanStack#3546 - TanStack#3563 - TanStack#3565 ### Upstream changes to solid-router - TanStack#3592 - TanStack#3591 - TanStack#3589 - TanStack#3616 ### Passing E2E test suites - [x] basic - [x] website - [x] scroll-restoration - [x] server-functions --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Brenley Dueck <brenleydueck@gmail.com> Co-authored-by: Iha Shin <me@xiniha.dev> Co-authored-by: Brenley Dueck <brenley@crowdbotics.com>

refactor(router-core): begin migrating types from react-router and so…

044df22

…lid-router to router-core

github-actions bot added package: react-router package: router-core package: solid-router labels Feb 23, 2025

Merge remote-tracking branch 'origin/main' into types-migrate-to-core

638f11b

ci: apply automated fixes

27d238b

chorobin added 2 commits February 23, 2025 20:52

fix(router-core): import NoInfer

5f83e7d

Merge remote-tracking branch 'origin/types-migrate-to-core' into type…

90c74be

…s-migrate-to-core

schiller-manuel self-requested a review February 23, 2025 20:13

schiller-manuel approved these changes Feb 23, 2025

View reviewed changes

chore: fix eslint

cf6c928

SeanCassiere reviewed Feb 23, 2025

View reviewed changes

chore(react-router): fix type tests

579787d

schiller-manuel reviewed Feb 23, 2025

View reviewed changes

chorobin added 2 commits February 23, 2025 22:55

chore(solid-router): fix type tests

6b62397

chore: export RouteById

86e9ae7

chorobin merged commit 72b505c into main Feb 23, 2025
7 checks passed

chorobin deleted the types-migrate-to-core branch February 23, 2025 22:18

birkskyum mentioned this pull request Feb 25, 2025

SolidJS driver for TanStack Start #3522

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

refactor(router-core): begin migrating types from react-router and solid-router to router-core #3538

refactor(router-core): begin migrating types from react-router and solid-router to router-core #3538

Uh oh!

chorobin commented Feb 23, 2025

Uh oh!

nx-cloud bot commented Feb 23, 2025 •

edited

Loading

Uh oh!

pkg-pr-new bot commented Feb 23, 2025 •

edited

Loading

Uh oh!

SeanCassiere Feb 23, 2025

Uh oh!

chorobin Feb 23, 2025

Uh oh!

chorobin Feb 23, 2025

Uh oh!

schiller-manuel Feb 23, 2025

Uh oh!

chorobin Feb 23, 2025 •

edited

Loading

Uh oh!

schiller-manuel Feb 23, 2025 •

edited

Loading

Uh oh!

Uh oh!

SimenB commented Feb 24, 2025 •

edited

Loading

Uh oh!

schiller-manuel commented Feb 24, 2025

Uh oh!

SimenB commented Feb 24, 2025

Uh oh!

SimenB commented Feb 25, 2025

Uh oh!

Uh oh!

Uh oh!

refactor(router-core): begin migrating types from react-router and solid-router to router-core #3538

refactor(router-core): begin migrating types from react-router and solid-router to router-core #3538

Uh oh!

Conversation

chorobin commented Feb 23, 2025

Uh oh!

nx-cloud bot commented Feb 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pkg-pr-new bot commented Feb 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SeanCassiere Feb 23, 2025

Choose a reason for hiding this comment

Uh oh!

chorobin Feb 23, 2025

Choose a reason for hiding this comment

Uh oh!

chorobin Feb 23, 2025

Choose a reason for hiding this comment

Uh oh!

schiller-manuel Feb 23, 2025

Choose a reason for hiding this comment

Uh oh!

chorobin Feb 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

schiller-manuel Feb 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

SimenB commented Feb 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

schiller-manuel commented Feb 24, 2025

Uh oh!

SimenB commented Feb 24, 2025

Uh oh!

SimenB commented Feb 25, 2025

Uh oh!

Uh oh!

nx-cloud bot commented Feb 23, 2025 •

edited

Loading

pkg-pr-new bot commented Feb 23, 2025 •

edited

Loading

chorobin Feb 23, 2025 •

edited

Loading

schiller-manuel Feb 23, 2025 •

edited

Loading

SimenB commented Feb 24, 2025 •

edited

Loading